Commit 2124dab3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/cadence' 

  - Replace Douglas with Tom Joseph as Cadence PCI host/endpoint maintainer
    (Lorenzo Pieralisi)

* remotes/lorenzo/pci/cadence:
  MAINTAINERS: Update PCI Cadence maintainer entry
parents b6019755 64c379d7

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11581,7 +11581,7 @@ F: Documentation/devicetree/bindings/pci/pci-armada8k.txt 
F:	drivers/pci/controller/dwc/pcie-armada8k.c



PCI DRIVER FOR CADENCE PCIE IP

M:	Alan Douglas <adouglas@cadence.com>

M:	Tom Joseph <tjoseph@cadence.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/cdns,*.txt