summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-12-10 22:19:21 +0800
committerOlof Johansson <olof@lixom.net>2013-12-11 17:12:04 -0800
commit2a82f95c3fb4904a473e205f3510b6e8884dd34d (patch)
treed45cfcd54896a0e805cbdb9b0ac1a65d6f04a85a /MAINTAINERS
parentb988ba1b4eba12008107b16fe3714293afdca47e (diff)
downloadlinux-2a82f95c3fb4904a473e205f3510b6e8884dd34d.tar.gz
linux-2a82f95c3fb4904a473e205f3510b6e8884dd34d.tar.bz2
linux-2a82f95c3fb4904a473e205f3510b6e8884dd34d.zip
MAINTAINERS: merge IMX6 entry into IMX
I have been co-maintaining IMX sub-architecture for a couple of years, and collecting IMX sub-architecture patches rather than IMX6 only ones for a few release cycles. It makes sense to officially add myself as the co-maintainer for IMX sub-architecture now. Consequently, IMX6 entry can just be merged into IMX. While at it, add a 'F:' entry for IMX DTS files. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 3 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 13c15c83a46e..1db904450e87 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -893,20 +893,15 @@ F: arch/arm/include/asm/hardware/dec21285.h
F: arch/arm/mach-footbridge/
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
+M: Shawn Guo <shawn.guo@linaro.org>
M: Sascha Hauer <kernel@pengutronix.de>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
-T: git git://git.pengutronix.de/git/imx/linux-2.6.git
+T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
F: arch/arm/mach-imx/
+F: arch/arm/boot/dts/imx*
F: arch/arm/configs/imx*_defconfig
-ARM/FREESCALE IMX6
-M: Shawn Guo <shawn.guo@linaro.org>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
-F: arch/arm/mach-imx/*imx6*
-
ARM/FREESCALE MXS ARM ARCHITECTURE
M: Shawn Guo <shawn.guo@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)