]> 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)
commitc1aae77b70a83ea45311d8adfa7bf2214b5d1560
tree2781c817808e9196ed6114c414bb58dacd981501
parent0a32ffb07da65fc25db1f91bc9f3fa276b0be7c6
parenteddcd2c8ae4c68af3fecff346f8220a13a7b5ffc
parent45947ecd579b9e0f2aeb88b84584d678e70146fe
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