Merge branch 'pci/mjg-pci-roms-from-efi' into next
Bjorn Helgaas [Thu, 6 Dec 2012 21:37:32 +0000 (14:37 -0700)]
* 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

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

Simple merge
Simple merge
Simple merge
Simple merge