Merge branches 'pm-tools-fixes' and 'pm-sleep-fixes'
commitcd16f3dcdb1817956277fbeee0746ae1eb4f851a
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Nov 2016 22:24:58 +0000 (11 23:24 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Nov 2016 22:24:58 +0000 (11 23:24 +0100)
tree381b37d2dee864945d281b01e2a89bd4fc25de7c
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911
parentc25badc9ceb612c6cc227a6fc4b0aaf678e3bcf9
parent6f75c3fd56daf547d684127a7f83c283c3c160d1
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