Merge branch 'arm/fixes' into arm/soc

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 10816e5..df6f20f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9252,6 +9252,7 @@ F:        include/linux/soc/ixp4xx/qmgr.h
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 M:     Deepak Saxena <dsaxena@plexity.net>
 S:     Maintained
+F:     Documentation/devicetree/bindings/display/intel,ixp46x-rng.yaml
 F:     drivers/char/hw_random/ixp4xx-rng.c
 
 INTEL KEEM BAY DRM DRIVER
@@ -14015,6 +14016,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
 F:     drivers/pci/controller/dwc/pcie-fu740.c
 
+PCI DRIVER FOR INTEL IXP4XX
+M:     Linus Walleij <linus.walleij@linaro.org>
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml
+F:     drivers/pci/controller/pci-ixp4xx.c
+
 PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 M:     Jonathan Derrick <jonathan.derrick@intel.com>
 L:     linux-pci@vger.kernel.org
@@ -17914,6 +17921,7 @@ F:      include/media/i2c/tw9910.h
 
 TEE SUBSYSTEM
 M:     Jens Wiklander <jens.wiklander@linaro.org>
+R:     Sumit Garg <sumit.garg@linaro.org>
 L:     op-tee@lists.trustedfirmware.org
 S:     Maintained
 F:     Documentation/staging/tee.rst