tree 662259b3d602db1ba4fe203346cc73dff826b2fa
parent 3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c
parent dbd3fc3345390a989a033427aa915a0dfb62149f
author Bjorn Helgaas <bhelgaas@google.com> 1355181612 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1355181612 -0700

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