Merge branch 'pci/mjg-pci-roms-from-efi' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Dec 2012 23:20:12 +0000 (16:20 -0700)
commit1cb73f8c479e66541fefd3f7fa547b1fa56cdc54
tree662259b3d602db1ba4fe203346cc73dff826b2fa
parent3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c
parentdbd3fc3345390a989a033427aa915a0dfb62149f
Merge branch 'pci/mjg-pci-roms-from-efi' into next

* pci/mjg-pci-roms-from-efi:
  PCI: Use phys_addr_t for physical ROM address
arch/x86/pci/common.c
include/linux/pci.h