Merge back earlier acpi-hotplug material.

author Rafael J. Wysocki <[email protected]>

Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)

committer Rafael J. Wysocki <[email protected]>

Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)
author Rafael J. Wysocki <[email protected]>
Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)
committer Rafael J. Wysocki <[email protected]>
Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)
diff --cc drivers/acpi/pci_root.c
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
author	Rafael J. Wysocki <[email protected]>
	Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)
committer	Rafael J. Wysocki <[email protected]>
	Fri, 22 Nov 2013 20:48:00 +0000 (21:48 +0100)
		1	2
drivers/acpi/pci_root.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/scan.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	patch \|	diff1 \|	diff2 \|	blob \| history