diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-03 23:53:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-03 23:53:19 +0200 |
| commit | 4467ade90d62a87c449bc35df61378a81a702741 (patch) | |
| tree | 94140c5287598fef8a7a7a2f056554fc3c818963 /include/linux/fpga/fpga-mgr.h | |
| parent | b2a84eedca1b827c6e513a8139e47b394f2d988d (diff) | |
| parent | eb7f43c4adb4a789f99f53916182c3401b4e33c7 (diff) | |
| parent | 020a63756707d3074fd00507c3bfd461e1cdf3eb (diff) | |
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()