summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-06 02:17:59 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-06 02:17:59 +0100
commit7cdcec991c06cd6d792b304851cc245cfec507a7 (patch)
tree02882db32499898cd120b5f3c5ab6d508890d156 /drivers/base
parentdc1ccc48159d63eca5089e507c82c7d22ef60839 (diff)
parent813e8e3d6aaa0b511126cce15c16a931afffe768 (diff)
parent2167e2399dc5e69c62db56d933e9c8cbe107620a (diff)
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