diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-02 11:00:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-02 11:00:28 +0200 |
| commit | e3a495c4ee64eb2ce8aaef244d7a0b68fd5216fd (patch) | |
| tree | bd99584d79f474e9b1484fca0b047ca2599d4dab /kernel | |
| parent | ef74b5bf22704bb1e7b67396704bbb41e1df0e39 (diff) | |
| parent | ead18c23c263374ed098a7d955b29b4a466d4573 (diff) | |
| parent | 648464076160ee7a4112d05eea13621790ab9d04 (diff) | |
| parent | 6f1d7c45dbbadd1a3c6eb9a9a485ef1975be4760 (diff) | |
| download | linux-e3a495c4ee64eb2ce8aaef244d7a0b68fd5216fd.tar.bz2 | |
Merge branches 'pm-core', 'pm-sleep' and 'acpi-pm'
* pm-core:
driver core: Introduce device links reference counting
PM / wakeirq: Add wakeup name to dedicated wake irqs
* pm-sleep:
PM / hibernate: Change message when writing to /sys/power/resume
PM / hibernate: Make passing hibernate offsets more friendly
PCMCIA / PM: Avoid noirq suspend aborts during suspend-to-idle
* acpi-pm:
ACPI / PM: Fix keyboard wakeup from suspend-to-idle on ASUS UX331UA
ACPI / PM: Allow deeper wakeup power states with no _SxD nor _SxW
ACPI / PM: Reduce LPI constraints logging noise
ACPI / PM: Do not reconfigure GPEs for suspend-to-idle