Merge branch 'pci/mjg-rom' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Apr 2013 23:16:49 +0000 (17:16 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Apr 2013 23:16:49 +0000 (17:16 -0600)
commita1259041e690916bbea2608115879164c7f85813
tree7897a9f6b90d088cf6d3b240bd8c8b142f822d36
parent8bb9660418e05bb1845ac1a2428444d78e322cc7
parent06a08570085b3b20c45f45dc66dc46851ecbcb5b
Merge branch 'pci/mjg-rom' into for-linus

* pci/mjg-rom:
  radeon: Attempt to use platform-provided ROM image
  nouveau: Attempt to use platform-provided ROM image
  PCI: Add PCI ROM helper for platform-provided ROM images