]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Apr 2015 21:25:23 +0000 (23:25 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 9 Apr 2015 21:25:23 +0000 (23:25 +0200)
* 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


Trivial merge