diff options
| author | Rafael J. Wysocki | 2015-04-09 23:25:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2015-04-09 23:25:23 +0200 |
| commit | b2d5fb97d37fb35708a0811af74d9e76e44d421c (patch) | |
| tree | b650c08d837b18bdce7e9de35ec410a0e71b57c1 /.gitignore | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| parent | f82daee49c09cf6a99c28303d93438a2566e5552 (diff) | |
| parent | c75de0ac0756d4b442f460e10461720c7c2412c2 (diff) | |
| parent | c7e8bdf5872c5a8f5a6494e16fe839c38a0d3d3d (diff) | |
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