Merge branch 'pci/mjg-pci-roms-from-efi' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 6 Dec 2012 21:37:32 +0000 (14:37 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 6 Dec 2012 21:37:32 +0000 (14:37 -0700)
commit72e1e868ca8f14ef34c95e0e8b73f64b6acf5934
treed3bc99f121693ab8f09c03ea555254c9314ff98d
parentedb1daab8e91338b7e2a6c41faec695891ccda35
parentf9a37be0f02a943d63e3346b19f9c9d8d91826cb
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
arch/x86/pci/common.c
drivers/pci/bus.c
drivers/pci/pci.c
include/linux/pci.h