From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 Dec 2013 01:17:59 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-cpufreq'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cdcec991c06cd6d792b304851cc245cfec507a7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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
---

7cdcec991c06cd6d792b304851cc245cfec507a7
diff --cc drivers/base/power/main.c
index 1b41fca3d65a,1b41fca3d65a,10c3510d72a9..e3219dfd736c
--- a/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"