]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3603ef94e3463e85921e7e26201d4249800843ac
tree2781c817808e9196ed6114c414bb58dacd981501
parenta9bb196e55b46b795050d487be93090b76badd5a
parent8c866e36d555621f4d207d5f01dda303446aa219
parent669d6e47f9f7cc70272a65401be633d99c8083e1
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