diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-28 23:26:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-28 23:26:15 +0200 |
| commit | cf5b8ff9bd95e916df38318884cdfc8e1802175f (patch) | |
| tree | f8c3dbf0f1aef44216f27cbbeac0a2ab107289c4 /include/acpi | |
| parent | aef49c3ca9939c003f7e040df9fe5c3f13c2b0b5 (diff) | |
| parent | 60ee031aabbe602df01cb12f3098e99262832e62 (diff) | |
| parent | 68e22011856f036bd9b0328b9b62d953e668a7ae (diff) | |
| parent | fc14eebfc20854a38fd9f1d93a42b1783dad4d17 (diff) | |
Merge branches 'pm-pci', 'acpi-pm' and 'pm-sleep' into linux-next
* 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