From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 1 Apr 2013 23:16:49 +0000 (-0600)
Subject: Merge branch 'pci/mjg-rom' into for-linus
X-Git-Tag: v3.9-rc6~8^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a1259041e690916bbea2608115879164c7f85813;p=users%2Fwilly%2Flinux.git

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

a1259041e690916bbea2608115879164c7f85813