Merge branch 'acpi-pci-hotplug' into acpi-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Nov 2013 22:56:32 +0000 (23:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Nov 2013 22:56:32 +0000 (23:56 +0100)
commit8ff47aafb25cc80417118e4968d4e7ca3f46c3ee
treef63632f103c46638f9decbca6f7a2889c2764e39
parent2c22e6520ac87d8b12d4d9941e81d4119f2d903c
parentf26ca1d699e8b54a50d9faf82327d3c2072aaedd
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
drivers/pci/hotplug/acpiphp_glue.c