From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 19 Sep 2014 05:05:06 +0000 (-0600)
Subject: Merge branch 'pci/vga'; commit '6a73336bde29' into for-linus
X-Git-Tag: firefly_0821_release~176^2~3180^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=649ae75286793304130e747efa7d1a88daaf7e2e;p=firefly-linux-kernel-4.4.55.git

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

649ae75286793304130e747efa7d1a88daaf7e2e