diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 19:40:13 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 19:40:13 +0200 |
| commit | d785260e2f57d87de5c059de2dabc3cd31b745f0 (patch) | |
| tree | 3218775e396bde8b8139a8c3a01bb95cdc0822c2 /drivers/video/matrox/matroxfb_base.h | |
| parent | Merge branch 'pci/misc' into next (diff) | |
| parent | MAINTAINERS: Add generic PCI host controller driver (diff) | |
| download | linux-d785260e2f57d87de5c059de2dabc3cd31b745f0.tar.xz linux-d785260e2f57d87de5c059de2dabc3cd31b745f0.zip | |
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
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.h')
0 files changed, 0 insertions, 0 deletions