summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentLinux 3.13-rc6 (diff)
parentPCI / ACPI: Install wakeup notify handlers for all PCI devs with ACPI (diff)
parentACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug (diff)
downloadlinux-4706515a9284d8bcef4dab53e4568c38a02a09c7.tar.xz
linux-4706515a9284d8bcef4dab53e4568c38a02a09c7.zip
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