OSDN Git Service

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)
commitb2d5fb97d37fb35708a0811af74d9e76e44d421c
treeb650c08d837b18bdce7e9de35ec410a0e71b57c1
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
parentf82daee49c09cf6a99c28303d93438a2566e5552
parentc75de0ac0756d4b442f460e10461720c7c2412c2
parentc7e8bdf5872c5a8f5a6494e16fe839c38a0d3d3d
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