diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:31 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:31 +0300 |
| commit | a4ffbb7a96eab872ead38f8013883e958180c730 (patch) | |
| tree | 3825c7ce5e82e4b5eeefad0af85a35ac2342fa63 /MAINTAINERS | |
| parent | 51bc2b7ffd5d9c39c04a76fbb30c1f53c0cc635e (diff) | |
| parent | 52ab55dfe32357d5889eef2969a03dd662aa2b7d (diff) | |
| download | linux-a4ffbb7a96eab872ead38f8013883e958180c730.tar.xz | |
Merge branch 'remotes/lorenzo/pci/misc'
- Remove layerscape-gen4 dependencies on OF and ARM64, add dependency on
ARCH_LAYERSCAPE (Geert Uytterhoeven)
- Remove obsolete HiSilicon PCIe DT description (Dongdong Liu)
* remotes/lorenzo/pci/misc:
dt-bindings: PCI: hisi: Delete the obsolete HiSilicon PCIe file
PCI: mobiveil: Improve PCIE_LAYERSCAPE_GEN4 dependencies
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1d556b3e325a..954f1f37beb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13907,7 +13907,6 @@ PCIE DRIVER FOR HISILICON M: Zhou Wang <wangzhou1@hisilicon.com> L: linux-pci@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt F: drivers/pci/controller/dwc/pcie-hisi.c PCIE DRIVER FOR HISILICON KIRIN |