Merge branch 'topic/stratus' into next

author Bjorn Helgaas <[email protected]>

Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)

committer Bjorn Helgaas <[email protected]>

Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
author Bjorn Helgaas <[email protected]>
Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
committer Bjorn Helgaas <[email protected]>
Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
diff --cc arch/x86/pci/common.c
Simple merge
diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/probe.c
Simple merge
author	Bjorn Helgaas <[email protected]>
	Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
committer	Bjorn Helgaas <[email protected]>
	Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
		1	2
arch/x86/pci/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/probe.c	patch \|	diff1 \|	diff2 \|	blob \| history