From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 31 Dec 2013 21:03:37 +0000 (+0100)
Subject: Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'
X-Git-Tag: v3.13-rc7~2^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4706515a9284d8bcef4dab53e4568c38a02a09c7;p=~emulex%2Finfiniband.git

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
---

4706515a9284d8bcef4dab53e4568c38a02a09c7