From: Bjorn Helgaas Date: Thu, 6 Dec 2012 21:37:32 +0000 (-0700) Subject: Merge branch 'pci/mjg-pci-roms-from-efi' into next X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~34^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e1e868ca8f14ef34c95e0e8b73f64b6acf5934;p=pandora-kernel.git 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 --- 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 Reading git-diff-tree failed