From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 9 Apr 2015 21:25:23 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Tag: v4.0~12^2
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=b2d5fb97d37fb35708a0811af74d9e76e44d421c;p=karo-tx-linux.git

Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'

* pm-sleep:
  Revert "PM / hibernate: avoid unsafe pages in e820 reserved regions"

* pm-cpufreq:
  cpufreq: Schedule work for the first-online CPU on resume

* pm-cpuidle:
  cpuidle: ACPI: do not overwrite name and description of C0
  cpuidle: remove state_count field from struct cpuidle_device
---

b2d5fb97d37fb35708a0811af74d9e76e44d421c