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 | 4706515a9284d8bcef4dab53e4568c38a02a09c7 (diff) | |
| parent | 98a947abdd54e5de909bebadfced1696ccad30cf (diff) | |
| parent | 3308d535806dfce3e4dfe06743f16dc925aa4c4c (diff) | |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'pm+acpi-3.13-rc7
* 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