Merge branch 'acpi-pci-hotplug' into acpi-ost
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:06:58 +0000 (01:06 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:06:58 +0000 (01:06 +0100)
commit2bd74d91b1217d84d08db57b860d056d130248d3
tree6333daab84310e75200be4c3dc511b7e4baa1f42
parentae3caa80a5d532d334c7a4785d74104e3de5a9ae
parentcc6254e00eb676dda6501655f8185aef7b761b4f
Merge branch 'acpi-pci-hotplug' into acpi-ost
drivers/acpi/scan.c
include/acpi/acpi_bus.h