diff options
author | 2013-12-31 22:03:37 +0100 | |
---|---|---|
committer | 2013-12-31 22:03:37 +0100 | |
commit | 4706515a9284d8bcef4dab53e4568c38a02a09c7 (patch) | |
tree | 0df1f395445ea40051ea7b56c2836202d2d1c82a /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Linux 3.13-rc6 (diff) | |
parent | PCI / ACPI: Install wakeup notify handlers for all PCI devs with ACPI (diff) | |
parent | ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug (diff) | |
download | linux-dev-4706515a9284d8bcef4dab53e4568c38a02a09c7.tar.xz linux-dev-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