diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 22:37:32 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 22:37:32 +0100 |
commit | 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 (patch) | |
tree | d3bc99f121693ab8f09c03ea555254c9314ff98d /drivers/pci/probe.c | |
parent | Merge branch 'pci/huang-d3cold-fixes' into next (diff) | |
parent | x86: Use PCI setup data (diff) | |
download | linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.tar.xz linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.zip |
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
Diffstat (limited to 'drivers/pci/probe.c')
0 files changed, 0 insertions, 0 deletions