diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 22:09:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 22:09:28 +0100 |
| commit | 0a405fe97fd54d5e89560c6d0f4070ff43862a49 (patch) | |
| tree | 2781c817808e9196ed6114c414bb58dacd981501 | |
| parent | Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug' (diff) | |
| parent | intel_pstate: Fail initialization if P-state information is missing (diff) | |
| parent | Merge branch 'cpuidle/3.13-fixes' of git://git.linaro.org/people/daniel.lezca... (diff) | |
| download | linux-0a405fe97fd54d5e89560c6d0f4070ff43862a49.tar.xz linux-0a405fe97fd54d5e89560c6d0f4070ff43862a49.zip | |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
intel_pstate: Fail initialization if P-state information is missing
cpufreq: preserve user_policy across suspend/resume
cpufreq: Clean up after a failing light-weight initialization
* pm-cpuidle:
ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function