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)
* 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


Trivial merge