]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 20dd2f7 fedbeee)
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)
commitadb7389762bb6899ac3c5bcc4af91b42e1e59b96
tree3218775e396bde8b8139a8c3a01bb95cdc0822c2tree | snapshot
parent20dd2f79def0989be0d9c915ce9fedfe9e9569dccommit | diff
parentfedbeeed80ad37cf3ef7861b9e668288953efeeecommit | 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
Linux Kernel Source Tree.