projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c266b02 7e6d5cd)
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)
commitcdf4f4dc118bafd97d0148d53730e396ece11afa
tree91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8tree | snapshot
parentc266b026ae7a51f876eb74e15ff63f834fe35976commit | diff
parent7e6d5cd88a6f4961ed2968799ef98528c13ac5f8commit | diff
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 diff1 | diff2 | blob | history
drivers/pci/controller/dwc/Kconfig diff1 | diff2 | blob | history
drivers/pci/controller/dwc/Makefile diff1 | diff2 | blob | history
John Crispins staging tree