Merge branches 'pm-cpuidle' and 'pm-cpufreq'

* pm-cpuidle:
  cpuidle: Check for dev before deregistering it.
  intel_idle: Fixed C6 state on Avoton/Rangeley processors

* pm-cpufreq:
  cpufreq: fix garbage kobjects on errors during suspend/resume
  cpufreq: suspend governors on system suspend/hibernate

diff --cc drivers/base/power/main.c
index 1b41fca3d65a54545c6c124e0df696998c29a1af,1b41fca3d65a54545c6c124e0df696998c29a1af,10c3510d72a9426ad91dd4f76ec94db01239fa52..e3219dfd736c64fbf13976ce3fa7f66b89e6484e
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
--- 3/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@@ -29,9 -29,9 -29,8 +29,10 @@@@
   #include <linux/async.h>
   #include <linux/suspend.h>
   #include <trace/events/power.h>
++ #include <linux/cpufreq.h>
   #include <linux/cpuidle.h>
  +#include <linux/timer.h>
  +
   #include "../base.h"
   #include "power.h"
   

diff --cc include/linux/cpufreq.h
Simple merge