summaryrefslogtreecommitdiff
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-04 00:53:19 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-04 00:53:19 +0300
commit4467ade90d62a87c449bc35df61378a81a702741 (patch)
tree94140c5287598fef8a7a7a2f056554fc3c818963 /drivers/pci/pci.c
parentb2a84eedca1b827c6e513a8139e47b394f2d988d (diff)
parenteb7f43c4adb4a789f99f53916182c3401b4e33c7 (diff)
parent020a63756707d3074fd00507c3bfd461e1cdf3eb (diff)
downloadlinux-4467ade90d62a87c449bc35df61378a81a702741.tar.xz
Merge branches 'acpi-scan' and 'acpi-pm'
* acpi-scan: ACPI / scan: Enable GPEs before scanning the namespace ACPICA: Make it possible to enable runtime GPEs earlier ACPICA: Dispatch active GPEs at init time * acpi-pm: ACPI / PM: Add debug statements to acpi_pm_notify_handler() ACPI: Add debug statements to acpi_global_event_handler() ACPI / sleep: Make acpi_sleep_syscore_init() static ACPI / PCI / PM: Rework acpi_pci_propagate_wakeup() ACPI / PM: Split acpi_device_wakeup() PCI / PM: Skip bridges in pci_enable_wake()