Rafael J. Wysocki 8f8e5c3e27 Merge branch 'acpi-pm' ... * acpi-pm: PM / core: Drop run_wake flag from struct dev_pm_info PCI / PM: Simplify device wakeup settings code PCI / PM: Drop pme_interrupt flag from struct pci_dev ACPI / PM: Consolidate device wakeup settings code ACPI / PM: Drop run_wake from struct acpi_device_wakeup_flags ACPI / sleep: EC-based wakeup from suspend-to-idle on recent systems platform: x86: intel-hid: Wake up the system from suspend-to-idle platform: x86: intel-vbtn: Wake up the system from suspend-to-idle ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle platform/x86: Add driver for ACPI INT0002 Virtual GPIO device PCI / PM: Restore PME Enable if skipping wakeup setup PM / sleep: Print timing information if debug is enabled ACPI / PM: Clean up device wakeup enable/disable code ACPI / PM: Change log level of wakeup-related message USB / PCI / PM: Allow the PCI core to do the resume cleanup ACPI / PM: Run wakeup notify handlers synchronously Conflicts: drivers/base/power/main.c		2017-07-03 14:23:09 +02:00
..
acpi	Merge branch 'acpi-pm'	2017-07-03 14:23:09 +02:00
asm-generic
clocksource
crypto
drm
dt-bindings
keys
kvm
linux	Merge branch 'acpi-pm'	2017-07-03 14:23:09 +02:00
math-emu
media
memory
misc	auxdisplay: charlcd: Add support for 4-bit interfaces	2017-03-17 15:10:49 +09:00
net
pcmcia
ras
rdma
rxrpc
scsi
soc
sound
target
trace
uapi	Merge branch 'uuid-types'	2017-07-03 14:13:44 +02:00
video
xen