diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 22:31:15 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 22:31:15 +0100 |
| commit | cdf4f4dc118bafd97d0148d53730e396ece11afa (patch) | |
| tree | 91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8 /Documentation/xillybus.txt | |
| parent | Merge branch 'remotes/lorenzo/pci/mediatek' (diff) | |
| parent | PCI: uniphier: Add UniPhier PCIe host controller support (diff) | |
| download | linux-cdf4f4dc118bafd97d0148d53730e396ece11afa.tar.xz linux-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 'Documentation/xillybus.txt')
0 files changed, 0 insertions, 0 deletions