Merge branches 'pm-cpuidle' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Dec 2013 01:17:59 +0000 (02:17 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Dec 2013 01:17:59 +0000 (02:17 +0100)
commit7cdcec991c06cd6d792b304851cc245cfec507a7
tree02882db32499898cd120b5f3c5ab6d508890d156
parentdc1ccc48159d63eca5089e507c82c7d22ef60839
parent813e8e3d6aaa0b511126cce15c16a931afffe768
parent2167e2399dc5e69c62db56d933e9c8cbe107620a
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
drivers/base/power/main.c
include/linux/cpufreq.h