]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fdaf36b cf28855)
Merge branch 'pci/host-generic' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 30 May 2014 17:40:13 +0000 (11:40 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 30 May 2014 17:40:13 +0000 (11:40 -0600)
commitd785260e2f57d87de5c059de2dabc3cd31b745f0
tree3218775e396bde8b8139a8c3a01bb95cdc0822c2tree | snapshot
parentfdaf36bd360fe1e74b34262ad705ef39d52c12decommit | diff
parentcf28855ba7e03f2e2ce85166c117c7b6100dc710commit | diff
Merge branch 'pci/host-generic' into next

* pci/host-generic:
  MAINTAINERS: Add generic PCI host controller driver
  PCI: generic: Add generic PCI host controller driver

Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
MAINTAINERS diff1 | diff2 | blob | history
drivers/pci/host/Kconfig diff1 | diff2 | blob | history
drivers/pci/host/Makefile diff1 | diff2 | blob | history
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git