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

* pci/mjg-pci-roms-from-efi:
  x86: Use PCI setup data
  PCI: Add support for non-BAR ROMs
  PCI: Add pcibios_add_device
  EFI: Stash ROMs if they're not in the PCI BAR

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/rom.c
Simple merge

diff --cc include/linux/pci.h
Simple merge