]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pci/host-tango' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 7 Jul 2017 18:42:25 +0000 (13:42 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 7 Jul 2017 18:42:25 +0000 (13:42 -0500)
commit9233ff7ca4756c2824036d131c560a9d535d2980
treed6e55435bfb31eb976396388d1c1531ce2e4479c
parentb60d5744db3705e7dc2d67222cd447797eb747ba
parent2ff1421c6e6c36d48992ed4ff31a7fe862037800
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
drivers/pci/host/Kconfig
drivers/pci/host/Makefile