diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:41:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:41:53 +0200 |
| commit | a24e16b1310ce7f474aa0caca0e66f0f174c022f (patch) | |
| tree | 63b60f52cf764763066071b56986225f7a82b3f9 /kernel/power | |
| parent | 601ef1f3c0df8d649700dc860c1de09acdf4b9b2 (diff) | |
| parent | 60ee031aabbe602df01cb12f3098e99262832e62 (diff) | |
| parent | 68e22011856f036bd9b0328b9b62d953e668a7ae (diff) | |
| parent | fc14eebfc20854a38fd9f1d93a42b1783dad4d17 (diff) | |
| parent | b8281fa71de26a64b56259bd04d940b1830639a8 (diff) | |
Merge branches 'pm-pci', 'acpi-pm', 'pm-sleep' and 'pm-avs'
* pm-pci:
PCI / PM: Clean up outdated comments in pci_target_state()
PCI / PM: Do not clear state_saved for devices that remain suspended
* acpi-pm:
ACPI: EC: Dispatch the EC GPE directly on s2idle wake
ACPICA: Introduce acpi_dispatch_gpe()
* pm-sleep:
PM / hibernate: Fix oops at snapshot_write()
PM / wakeup: Make s2idle_lock a RAW_SPINLOCK
PM / s2idle: Make s2idle_wait_head swait based
PM / wakeup: Make events_lock a RAW_SPINLOCK
PM / suspend: Prevent might sleep splats
* pm-avs:
PM / AVS: rockchip-io: add io selectors and supplies for PX30