]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
projects / mirror_ubuntu-eoan-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4706515 98a947a 3308d53)
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)
* 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


Trivial merge
Ubuntu Eoan Linux kernel mirror