Merge branch 'pci/vga'; commit '6a73336bde29' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 19 Sep 2014 05:05:06 +0000 (23:05 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 19 Sep 2014 05:05:06 +0000 (23:05 -0600)
commit649ae75286793304130e747efa7d1a88daaf7e2e
treec8afcb15a81f8211b3d5e114f834b9dbf5b17eaa
parent6de8eee17a324a4fd8d1a4588a18e976b68f330c
parentce6eacb07e287c0c3c8b5c316a9a7f9cecf69e95
parent6a73336bde293741026614135419e9b76afb9145
Merge branch 'pci/vga'; commit '6a73336bde29' into for-linus

* pci/vga:
  vgaarb: Drop obsolete #ifndef
  vgaarb: Don't default exclusively to first video device with mem+io

* commit '6a73336bde29':
  PCI: Remove "no hotplug settings from platform" warning