| commit | 6aed468480e8b03ece5a395fe8013e66348a2547 | |
| author | Bjorn Helgaas <bhelgaas@google.com> | |
| Fri, 7 Jul 2017 18:42:25 +0000 (7 13:42 -0500) | ||
| committer | Bjorn Helgaas <bhelgaas@google.com> | |
| Fri, 7 Jul 2017 18:42:25 +0000 (7 13:42 -0500) | ||
| tree | d6e55435bfb31eb976396388d1c1531ce2e4479c | treesnapshot (tar.gz zip) |
| parent | 7542a046bfddbaadc15f5f3e1845fd333604a5b8 | commitdiff |
| parent | 5e14e9fac308daf5607362f879e6de67e0b8dd5b | commitdiff |
Merge branch 'pci/host-tango' into next
* pci/host-tango:
PCI: tango: Add Sigma Designs Tango SMP8759 PCIe host bridge support
PCI: Add DT binding for Sigma Designs Tango PCIe controller
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
* pci/host-tango:
PCI: tango: Add Sigma Designs Tango SMP8759 PCIe host bridge support
PCI: Add DT binding for Sigma Designs Tango PCIe controller
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
| drivers/pci/host/Kconfig | diff1 | diff2 | blobhistory |
| drivers/pci/host/Makefile | diff1 | diff2 | blobhistory |