Merge branch 'acpi-pci-hotplug' into acpi-dock
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:09:33 +0000 (01:09 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:09:33 +0000 (01:09 +0100)
commit96075315c5e7077fc5a3ac54c9b9e97e376e66ed
treea75bfd74f4ff52997dfb3dda4f0da95be613296f
parent59b42fa01fe2d84f3c3f28ee6f25510820ace35b
parentcc6254e00eb676dda6501655f8185aef7b761b4f
Merge branch 'acpi-pci-hotplug' into acpi-dock
drivers/pci/hotplug/acpiphp_glue.c