tree 0df1f395445ea40051ea7b56c2836202d2d1c82a
parent 802eee95bde72fd0cd0f3a5b2098375a487d1eda
parent f084280cd34e375cd9736d14b023cfc7df3374bb
parent f244d8b623dae7a7bc695b0336f67729b95a9736
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388523817 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388523817 +0100

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