tree d6e55435bfb31eb976396388d1c1531ce2e4479c
parent 7542a046bfddbaadc15f5f3e1845fd333604a5b8
parent 5e14e9fac308daf5607362f879e6de67e0b8dd5b
author Bjorn Helgaas <bhelgaas@google.com> 1499452945 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1499452945 -0500

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