Merge remote-tracking branch 'lorenzo/pci/cadence' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 6 Apr 2018 13:41:08 +0000 (08:41 -0500)
committerBjorn Helgaas <helgaas@kernel.org>
Fri, 6 Apr 2018 13:41:08 +0000 (08:41 -0500)
* lorenzo/pci/cadence:
  MAINTAINERS: Add missing /drivers/pci/cadence directory entry

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 39eedce231863968de709de19b0b04f12625b2e8,9694269694384eaeb30fc3e08f00d5689d6ab15d..6d7de9df2a0e8a7c96ddc4e80d1f75b3d6e3345d
@@@ -6386,13 -6386,6 +6386,13 @@@ W:    http://www.hisilicon.co
  S:    Maintained
  F:    drivers/net/ethernet/hisilicon/hns3/
  
 +HISILICON LPC BUS DRIVER
 +M:    john.garry@huawei.com
 +W:    http://www.hisilicon.com
 +S:    Maintained
 +F:    drivers/bus/hisi_lpc.c
 +F:    Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt
 +
  HISILICON NETWORK SUBSYSTEM DRIVER
  M:    Yisen Zhuang <yisen.zhuang@huawei.com>
  M:    Salil Mehta <salil.mehta@huawei.com>
@@@ -10729,6 -10722,7 +10729,7 @@@ L:   linux-pci@vger.kernel.or
  Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
  S:    Supported
+ F:    drivers/pci/cadence/
  F:    drivers/pci/host/
  F:    drivers/pci/dwc/