summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-10-18 11:27:55 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-10-18 11:27:55 +0300
commitb23eb5c74e6eb6a0b3fb9cf3eb64481a17ce1cd1 (patch)
tree9a81e6b02f8969639045f61e7e40d6135539a7b0 /kernel
parent45144d42f299455911cc29366656c7324a3a7c97 (diff)
parent2d8b39a62a5d386a73f339e46fe05354a3a4895b (diff)
parentf49249d58abdc12067d69f15d509487171148b30 (diff)
downloadlinux-b23eb5c74e6eb6a0b3fb9cf3eb64481a17ce1cd1.tar.xz
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