projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6de8eee ce6eacb 6a73336)
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)
* 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


Trivial merge
Linux 6.x block layer and io_uring tree(s)