summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-28 00:14:11 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-28 00:14:11 +0100
commit6c09ea49ceb8a3b2b709718f6acdb1edd92ea899 (patch)
treeb5d099ade0d778c27f0f79f9939bc1fd8eeb3804 /drivers
parente66c176837462928a05a135bbe16cdce70536d6e (diff)
parentf8d5b9e9e5372f0deb7bc1ab1088a9b60b0a793d (diff)
parentf3ca4164529b875374c410193bbbac0ee960895f (diff)
Merge branches 'pm-cpufreq', 'pm-hibernate' and 'acpi-processor'
* pm-cpufreq: intel_pstate: Change busy calculation to use fixed point math. * pm-hibernate: PM / hibernate: Fix restore hang in freeze_processes() * acpi-processor: ACPI / processor: Rework processor throttling with work_on_cpu()