diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-12 01:24:58 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-12 01:24:58 +0300 |
| commit | cd16f3dcdb1817956277fbeee0746ae1eb4f851a (patch) | |
| tree | 381b37d2dee864945d281b01e2a89bd4fc25de7c /kernel | |
| parent | bc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff) | |
| parent | c25badc9ceb612c6cc227a6fc4b0aaf678e3bcf9 (diff) | |
| parent | 6f75c3fd56daf547d684127a7f83c283c3c160d1 (diff) | |
| download | linux-cd16f3dcdb1817956277fbeee0746ae1eb4f851a.tar.xz | |
Merge branches 'pm-tools-fixes' and 'pm-sleep-fixes'
* pm-tools-fixes:
cpupower: Correct return type of cpu_power_is_cpu_online() in cpufreq-set
* pm-sleep-fixes:
PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails
PM / sleep: fix device reference leak in test_suspend