Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 24b200d91b305a0cc7cf6f84f0ad40f3992d3f10..b2fcd1c6bdcb0cc0e122c7f0afa054f7eb5e80f7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1295,11 +1295,6 @@ F:       arch/arm/mach-aspeed/
 F:     arch/arm/boot/dts/aspeed-*
 N:     aspeed
 
-ARM/ATMEL AT91 Clock Support
-M:     Boris Brezillon <boris.brezillon@bootlin.com>
-S:     Maintained
-F:     drivers/clk/at91
-
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1481,6 +1476,16 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:     arch/arm/mach-imx/*vf610*
 F:     arch/arm/boot/dts/vf*
 
+ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE
+M:     Shawn Guo <shawnguo@kernel.org>
+M:     Li Yang <leoyang.li@nxp.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
+F:     arch/arm/boot/dts/ls1021a*
+F:     arch/arm64/boot/dts/freescale/fsl-*
+F:     arch/arm64/boot/dts/freescale/qoriq-*
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2009,6 +2014,7 @@ S:        Supported
 F:     arch/arm/boot/dts/emev2*
 F:     arch/arm/boot/dts/r7s*
 F:     arch/arm/boot/dts/r8a*
+F:     arch/arm/boot/dts/r9a*
 F:     arch/arm/boot/dts/sh*
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
@@ -2127,6 +2133,15 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/memory/*emif*
 
+ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
+M:     Tero Kristo <t-kristo@ti.com>
+M:     Nishanth Menon <nm@ti.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Supported
+F:     Documentation/devicetree/bindings/arm/ti/k3.txt
+F:     arch/arm64/boot/dts/ti/Makefile
+F:     arch/arm64/boot/dts/ti/k3-*
+
 ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 M:     Santosh Shilimkar <ssantosh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -4507,7 +4522,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER
 M:     Roy Pledge <Roy.Pledge@nxp.com>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/fsl-mc/bus/dpio
+F:     drivers/soc/fsl/dpio
 
 DPAA2 ETHERNET DRIVER
 M:     Ioana Radulescu <ruxandra.radulescu@nxp.com>
@@ -4737,7 +4752,7 @@ F:        include/linux/vga*
 DRM DRIVERS AND MISC GPU PATCHES
 M:     Gustavo Padovan <gustavo@padovan.org>
 M:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-M:     Sean Paul <seanpaul@chromium.org>
+M:     Sean Paul <sean@poorly.run>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -10571,6 +10586,7 @@ F:      arch/arm/plat-omap/
 F:     arch/arm/configs/omap1_defconfig
 F:     drivers/i2c/busses/i2c-omap.c
 F:     include/linux/platform_data/i2c-omap.h
+F:     include/linux/platform_data/ams-delta-fiq.h
 
 OMAP2+ SUPPORT
 M:     Tony Lindgren <tony@atomide.com>
@@ -10771,7 +10787,7 @@ F:      arch/*/boot/dts/
 F:     include/dt-bindings/
 
 OPENCORES I2C BUS DRIVER
-M:     Peter Korsgaard <jacmet@sunsite.dk>
+M:     Peter Korsgaard <peter@korsgaard.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     Documentation/i2c/busses/i2c-ocores
@@ -13207,7 +13223,7 @@ L:      linux-input@vger.kernel.org
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/input/touchscreen/silead.c
-F:     drivers/platform/x86/silead_dmi.c
+F:     drivers/platform/x86/touchscreen_dmi.c
 
 SILICON MOTION SM712 FRAME BUFFER DRIVER
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -14394,6 +14410,7 @@ F:      drivers/media/radio/radio-raremono.c
 THERMAL
 M:     Zhang Rui <rui.zhang@intel.com>
 M:     Eduardo Valentin <edubezval@gmail.com>
+R:     Daniel Lezcano <daniel.lezcano@linaro.org>
 L:     linux-pm@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git