Merge branches 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 31 Dec 2013 21:09:28 +0000 (22:09 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 31 Dec 2013 21:09:28 +0000 (22:09 +0100)
commit0a405fe97fd54d5e89560c6d0f4070ff43862a49
tree2781c817808e9196ed6114c414bb58dacd981501
parent4706515a9284d8bcef4dab53e4568c38a02a09c7
parent98a947abdd54e5de909bebadfced1696ccad30cf
parent3308d535806dfce3e4dfe06743f16dc925aa4c4c
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