Skip to content
  • Bjorn Helgaas's avatar
    Merge branch 'remotes/lorenzo/pci/uniphier' · cdf4f4dc
    Bjorn Helgaas authored
      - Add UniPhier PCIe controller driver and DT bindings (Kunihiko Hayashi)
    
    * remotes/lorenzo/pci/uniphier:
      PCI: uniphier: Add UniPhier PCIe host controller support
      dt-bindings: PCI: Add UniPhier PCIe host controller description
    
    # Conflicts:
    #	drivers/pci/controller/dwc/Kconfig
    #	drivers/pci/controller/dwc/Makefile
    cdf4f4dc