From mboxrd@z Thu Jan 1 00:00:00 1970 From: shawn.guo@linaro.org (Shawn Guo) Date: Tue, 10 Dec 2013 22:19:21 +0800 Subject: [PATCH] MAINTAINERS: merge IMX6 entry into IMX In-Reply-To: <20131210121626.39b3e543@ipc1.ka-ro> References: <20131210121626.39b3e543@ipc1.ka-ro> Message-ID: <1386685161-12758-1-git-send-email-shawn.guo@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Cc: Sascha Hauer --- MAINTAINERS | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 13c15c8..c0cad90 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -894,18 +894,13 @@ F: arch/arm/mach-footbridge/ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE M: Sascha Hauer -L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) -S: Maintained -T: git git://git.pengutronix.de/git/imx/linux-2.6.git -F: arch/arm/mach-imx/ -F: arch/arm/configs/imx*_defconfig - -ARM/FREESCALE IMX6 M: Shawn Guo L: linux-arm-kernel at 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* +F: arch/arm/mach-imx/ +F: arch/arm/boot/dts/imx* +F: arch/arm/configs/imx*_defconfig ARM/FREESCALE MXS ARM ARCHITECTURE M: Shawn Guo -- 1.7.9.5