| commit | d785260e2f57d87de5c059de2dabc3cd31b745f0 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri May 30 11:40:13 2014 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri May 30 11:40:13 2014 -0600 |
| tree | 3218775e396bde8b8139a8c3a01bb95cdc0822c2 | |
| parent | fdaf36bd360fe1e74b34262ad705ef39d52c12de [diff] | |
| parent | cf28855ba7e03f2e2ce85166c117c7b6100dc710 [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