diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 02:55:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 02:55:28 +0100 |
| commit | bcaea4678f0dc044c34c35ce8ab338106355102f (patch) | |
| tree | cd676f22c3542d44e84e9724faa998fb81f1a7af /arch | |
| parent | 4b67157f04b584379dd0e7426bf3485a85c9bb77 (diff) | |
| parent | 19351f340765ebef48d07eade8ffb5f6f1118244 (diff) | |
| parent | 8ffdfe35b8a67e509dee5719807b7f88ed2cda7e (diff) | |
Merge branches 'acpi-pm' and 'pm-sleep'
* acpi-pm:
platform/x86: surfacepro3: Support for wakeup from suspend-to-idle
ACPI / PM: Use Low Power S0 Idle on more systems
ACPI / PM: Make it possible to ignore the system sleep blacklist
* pm-sleep:
PM / hibernate: Drop unused parameter of enough_swap
block, scsi: Fix race between SPI domain validation and system suspend
PM / sleep: Make lock/unlock_system_sleep() available to kernel modules
PM: hibernate: Do not subtract NR_FILE_MAPPED in minimum_image_size()