]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branches 'pm-cpufreq' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Oct 2019 08:27:55 +0000 (10:27 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Oct 2019 08:27:55 +0000 (10:27 +0200)
* pm-cpufreq:
  ACPI: processor: Avoid NULL pointer dereferences at init time
  cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown

* pm-sleep:
  PM: sleep: include <linux/pm_runtime.h> for pm_wq
  ACPI: PM: Drop Dell XPS13 9360 from LPS0 Idle _DSM blacklist


Trivial merge