From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 11 Aug 2014 21:19:48 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e67ee10190e69332f929bdd6594a312363321a66;p=openwrt%2Fstaging%2Fblogic.git

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
---

e67ee10190e69332f929bdd6594a312363321a66