diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-01 01:03:37 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-01 01:03:37 +0400 |
| commit | 4706515a9284d8bcef4dab53e4568c38a02a09c7 (patch) | |
| tree | 0df1f395445ea40051ea7b56c2836202d2d1c82a /include | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
| parent | f084280cd34e375cd9736d14b023cfc7df3374bb (diff) | |
| parent | f244d8b623dae7a7bc695b0336f67729b95a9736 (diff) | |
| download | linux-4706515a9284d8bcef4dab53e4568c38a02a09c7.tar.xz | |
Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'
* acpi-pci-pm:
PCI / ACPI: Install wakeup notify handlers for all PCI devs with ACPI
* acpi-pci-hotplug:
ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug
ACPI / PCI / hotplug: Avoid warning when _ADR not present