tree c8afcb15a81f8211b3d5e114f834b9dbf5b17eaa
parent 6de8eee17a324a4fd8d1a4588a18e976b68f330c
parent ce6eacb07e287c0c3c8b5c316a9a7f9cecf69e95
parent 6a73336bde293741026614135419e9b76afb9145
author Bjorn Helgaas <bhelgaas@google.com> 1411103106 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1411103106 -0600

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