Merge branch 'arm/fixes' into arm/soc

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 81e1ede..df6f20f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2168,6 +2168,7 @@ M:        Daniel Palmer <daniel@thingy.jp>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://linux-chenxing.org/
+T:     git git://github.com/linux-chenxing/linux.git
 F:     Documentation/devicetree/bindings/arm/mstar/*
 F:     Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
 F:     Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
@@ -2436,9 +2437,12 @@ F:       drivers/*/*/*s3c24*
 F:     drivers/*/*s3c24*
 F:     drivers/*/*s3c64xx*
 F:     drivers/*/*s5pv210*
+F:     drivers/clocksource/samsung_pwm_timer.c
 F:     drivers/memory/samsung/
+F:     drivers/pwm/pwm-samsung.c
 F:     drivers/soc/samsung/
 F:     drivers/tty/serial/samsung*
+F:     include/clocksource/samsung_pwm.h
 F:     include/linux/platform_data/*s3c*
 F:     include/linux/serial_s3c.h
 F:     include/linux/soc/samsung/
@@ -9248,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
@@ -13347,12 +13352,6 @@ L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/mach-omap2/omap_hwmod*data*
 
-OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
-M:     Benoît Cousson <bcousson@baylibre.com>
-L:     linux-omap@vger.kernel.org
-S:     Maintained
-F:     arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-
 OMAP HWMOD SUPPORT
 M:     Benoît Cousson <bcousson@baylibre.com>
 M:     Paul Walmsley <paul@pwsan.com>
@@ -14017,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
@@ -17916,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