diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-07 01:37:32 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-07 01:37:32 +0400 |
| commit | 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 (patch) | |
| tree | d3bc99f121693ab8f09c03ea555254c9314ff98d /drivers/net/wireless/iwlegacy/csr.h | |
| parent | edb1daab8e91338b7e2a6c41faec695891ccda35 (diff) | |
| parent | f9a37be0f02a943d63e3346b19f9c9d8d91826cb (diff) | |
| download | linux-72e1e868ca8f14ef34c95e0e8b73f64b6acf5934.tar.xz | |
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/net/wireless/iwlegacy/csr.h')
0 files changed, 0 insertions, 0 deletions