diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-11 23:19:48 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-08-11 23:19:48 +0200 |
| commit | e67ee10190e69332f929bdd6594a312363321a66 (patch) | |
| tree | fb6fb2672899f7e2b57660d5d59f195cba6a59a7 /kernel | |
| parent | 21c806d9b189c2da652eb7fad96b662d3e2c82eb (diff) | |
| parent | 84c91b7ae07c62cf6dee7fde3277f4be21331f85 (diff) | |
| parent | 39c8bbaf67b157017929703a5eea7e83525b147c (diff) | |
| parent | 372ba8cb46b271a7662b92cbefedee56725f6bd0 (diff) | |
Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'
* pm-sleep:
PM / hibernate: avoid unsafe pages in e820 reserved regions
* pm-cpufreq:
cpufreq: arm_big_little: fix module license spec
cpufreq: speedstep-smi: fix decimal printf specifiers
cpufreq: OPP: Avoid sleeping while atomic
cpufreq: cpu0: Do not print error message when deferring
cpufreq: integrator: Use set_cpus_allowed_ptr
* pm-cpuidle:
cpuidle: menu: Lookup CPU runqueues less
cpuidle: menu: Call nr_iowait_cpu less times
cpuidle: menu: Use ktime_to_us instead of reinventing the wheel
cpuidle: menu: Use shifts when calculating averages where possible