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)
* pci/mjg-pci-roms-from-efi:
  PCI: Use phys_addr_t for physical ROM address

1  2 
arch/x86/pci/common.c
include/linux/pci.h

Simple merge
Simple merge