]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branches 'pm-sleep', 'pm-cpuidle' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 21 Apr 2014 22:10:17 +0000 (00:10 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 21 Apr 2014 22:10:17 +0000 (00:10 +0200)
commite38ed294298089362a224a3f601efe6a49d1a763
treeaa6d6b264e0044cc1c8495fe9c3e7501fb372814
parent1efa9f95eea6652ac0a8f4b98e92b7b55069aac9
parentf3f125324fc1b8500cd20a2907628f7e5d88a708
parentd27dca4217eb4cbdc3d33ad8c07799dd184873b9
parentd76ae2eabca5ff112bb58de8a7d52b70f8bb0608
Merge branches 'pm-sleep', 'pm-cpuidle' and 'pm-cpufreq'

* pm-sleep:
  PM / suspend: Make cpuidle work in the "freeze" state

* pm-cpuidle:
  intel_idle: fix IVT idle state table setting

* pm-cpufreq:
  cpufreq: highbank: fix ARM_HIGHBANK_CPUFREQ dependency warning
  cpufreq: ppc: Fix integer overflow in expression
  cpufreq, powernv: Fix build failure on UP
  cpufreq: unicore32: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO