diff options
author | 2019-01-02 15:31:15 -0600 | |
---|---|---|
committer | 2019-01-02 15:31:15 -0600 | |
commit | cdf4f4dc118bafd97d0148d53730e396ece11afa (patch) | |
tree | 91f12d628f1ec43fee71da3269b8fe0ad7d4b4e8 /tools/perf/scripts/python/exported-sql-viewer.py | |
parent | Merge branch 'remotes/lorenzo/pci/mediatek' (diff) | |
parent | PCI: uniphier: Add UniPhier PCIe host controller support (diff) | |
download | wireguard-linux-cdf4f4dc118bafd97d0148d53730e396ece11afa.tar.xz wireguard-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 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions