Merge branch 'pci/vga'; commit '6a73336b' into for-linus

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

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