diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-18 10:27:55 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-18 10:27:55 +0200 |
commit | b23eb5c74e6eb6a0b3fb9cf3eb64481a17ce1cd1 (patch) | |
tree | 9a81e6b02f8969639045f61e7e40d6135539a7b0 /kernel | |
parent | PCI: PM: Fix pci_power_up() (diff) | |
parent | ACPI: processor: Avoid NULL pointer dereferences at init time (diff) | |
parent | PM: sleep: include <linux/pm_runtime.h> for pm_wq (diff) | |
download | linux-b23eb5c74e6eb6a0b3fb9cf3eb64481a17ce1cd1.tar.xz linux-b23eb5c74e6eb6a0b3fb9cf3eb64481a17ce1cd1.zip |
Merge branches 'pm-cpufreq' and 'pm-sleep'
* 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