Merge branch 'pci/mjg-pci-roms-from-efi' into next

author Bjorn Helgaas <bhelgaas@google.com>

Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)

committer Bjorn Helgaas <bhelgaas@google.com>

Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
author Bjorn Helgaas <bhelgaas@google.com>
Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
committer Bjorn Helgaas <bhelgaas@google.com>
Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
diff --cc arch/x86/pci/common.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Bjorn Helgaas <bhelgaas@google.com>
	Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
committer	Bjorn Helgaas <bhelgaas@google.com>
	Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
		1	2
arch/x86/pci/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history