summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-31 22:03:37 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-31 22:03:37 +0100
commit4706515a9284d8bcef4dab53e4568c38a02a09c7 (patch)
tree0df1f395445ea40051ea7b56c2836202d2d1c82a /drivers/acpi
parent802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff)
parentf084280cd34e375cd9736d14b023cfc7df3374bb (diff)
parentf244d8b623dae7a7bc695b0336f67729b95a9736 (diff)
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