]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'remotes/lorenzo/pci/uniphier'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 2 Jan 2019 21:31:15 +0000 (15:31 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 2 Jan 2019 21:31:15 +0000 (15:31 -0600)
commit850fe0a53c6c1bad0302b255ddbdfbfc3112e8d4
tree91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8
parente8d4f1325a278e17371bb15036820b84437e9a6b
parentaed3e075296d637ba26a99c599c129d30dc22069
Merge branch 'remotes/lorenzo/pci/uniphier'

  - 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
MAINTAINERS
drivers/pci/controller/dwc/Kconfig
drivers/pci/controller/dwc/Makefile