| commit | 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Thu Dec 06 14:37:32 2012 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Thu Dec 06 14:37:32 2012 -0700 |
| tree | d3bc99f121693ab8f09c03ea555254c9314ff98d | |
| parent | edb1daab8e91338b7e2a6c41faec695891ccda35 [diff] | |
| parent | f9a37be0f02a943d63e3346b19f9c9d8d91826cb [diff] |
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