diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-22 00:10:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-22 00:10:17 +0200 |
| commit | e38ed294298089362a224a3f601efe6a49d1a763 (patch) | |
| tree | aa6d6b264e0044cc1c8495fe9c3e7501fb372814 /drivers | |
| parent | 1efa9f95eea6652ac0a8f4b98e92b7b55069aac9 (diff) | |
| parent | f3f125324fc1b8500cd20a2907628f7e5d88a708 (diff) | |
| parent | d27dca4217eb4cbdc3d33ad8c07799dd184873b9 (diff) | |
| parent | d76ae2eabca5ff112bb58de8a7d52b70f8bb0608 (diff) | |
| download | linux-e38ed294298089362a224a3f601efe6a49d1a763.tar.bz2 | |
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