diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 15:52:53 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 15:52:53 +0200 |
commit | afe94fb82c113727de211e32af88982534ba8b0c (patch) | |
tree | 0dc46066c667502bc92bd4ecf0cf1a89b596539e /drivers/base | |
parent | fff3df4bac0093bc8d4e5d349fc1bcd9c7c14da2 (diff) | |
parent | 4ec4f059088b48585c337328e05fa930c64d1ba8 (diff) | |
parent | 480f0de68caddfe336b8cc0c74a40328779940d3 (diff) | |
download | linux-afe94fb82c113727de211e32af88982534ba8b0c.tar.bz2 |
Merge branches 'pm-core' and 'pm-sleep'
* pm-core:
PM: runtime: Clarify documentation when callbacks are unassigned
PM: runtime: Allow unassigned ->runtime_suspend|resume callbacks
PM: runtime: Improve path in rpm_idle() when no callback
PM: runtime: document common mistake with pm_runtime_get_sync()
* pm-sleep:
PM: hibernate: remove leading spaces before tabs
PM: sleep: remove trailing spaces and tabs
PM: hibernate: fix spelling mistakes
PM: wakeirq: Set IRQF_NO_AUTOEN when requesting the IRQ