diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-31 22:25:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-31 22:25:07 +0100 |
| commit | 7d627280b359a965105bcdd8f08224dfa14a3961 (patch) | |
| tree | 7c9a91ea3869ac2ccafc80a5590f35af9a7d3d58 /kernel | |
| parent | 76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4 (diff) | |
| parent | c81407fe573d8ac3c7150f5373475598c59197de (diff) | |
| parent | 94fb823fcb4892614f57e59601bb9d4920f24711 (diff) | |
| download | linux-7d627280b359a965105bcdd8f08224dfa14a3961.tar.bz2 | |
Merge branches 'pm-cpufreq' and 'pm-sleep'
* pm-cpufreq:
cpufreq: cpufreq-dt: Restore default cpumask_setall(policy->cpus)
cpufreq: cpufreq-dt: disable unsupported OPPs
* pm-sleep:
PM / Sleep: fix recovery during resuming from hibernation
PM / Sleep: fix async suspend_late/freeze_late error handling