Merge branch 'acpi-pci-hotplug' into acpi-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 5 Mar 2014 23:48:26 +0000 (00:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 5 Mar 2014 23:48:26 +0000 (00:48 +0100)
commitd901188f002104905a7845298e1a7dc94189007a
tree14bf855f9bb377b67887d21892e0cacc259c6204
parent1e3bcb596c6b1cf6db93f8f506e2de260e771bad
parentb8a62d540240387c7e97a69127cab3ab9cadc70a
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
drivers/pci/hotplug/acpiphp_glue.c