diff options
| author | Bjorn Helgaas <[email protected]> | 2019-01-02 21:31:15 +0000 |
|---|---|---|
| committer | Bjorn Helgaas <[email protected]> | 2019-01-02 21:31:15 +0000 |
| commit | cdf4f4dc118bafd97d0148d53730e396ece11afa (patch) | |
| tree | 91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8 /drivers/pci/controller/dwc/pci-imx6.c | |
| parent | Merge branch 'remotes/lorenzo/pci/mediatek' (diff) | |
| parent | PCI: uniphier: Add UniPhier PCIe host controller support (diff) | |
| download | kernel-cdf4f4dc118bafd97d0148d53730e396ece11afa.tar.gz kernel-cdf4f4dc118bafd97d0148d53730e396ece11afa.zip | |
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
Diffstat (limited to 'drivers/pci/controller/dwc/pci-imx6.c')
0 files changed, 0 insertions, 0 deletions