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)
1  2 
drivers/pci/hotplug/acpiphp_glue.c

Simple merge