Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Aug 2014 21:19:48 +0000 (23:19 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Aug 2014 21:19:48 +0000 (23:19 +0200)
commite67ee10190e69332f929bdd6594a312363321a66
treefb6fb2672899f7e2b57660d5d59f195cba6a59a7
parent21c806d9b189c2da652eb7fad96b662d3e2c82eb
parent84c91b7ae07c62cf6dee7fde3277f4be21331f85
parent39c8bbaf67b157017929703a5eea7e83525b147c
parent372ba8cb46b271a7662b92cbefedee56725f6bd0
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
include/linux/sched.h
kernel/sched/core.c