Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next

author Bjorn Helgaas <[email protected]>

Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)

committer Bjorn Helgaas <[email protected]>

Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
author Bjorn Helgaas <[email protected]>
Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
committer Bjorn Helgaas <[email protected]>
Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
diff --cc drivers/acpi/pci_root.c
Simple merge
diff --cc include/linux/acpi.h
Simple merge
author	Bjorn Helgaas <[email protected]>
	Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
committer	Bjorn Helgaas <[email protected]>
	Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
		1	2
drivers/acpi/pci_root.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/acpi.h	patch \|	diff1 \|	diff2 \|	blob \| history