Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce515a6b authored by Shawn Guo's avatar Shawn Guo Committed by Olof Johansson
Browse files

MAINTAINERS: merge MXS entry into IMX one



The mach-mxs platform is actually co-maintained by myself and
pengutronix folks.  Also it's hosted in the same kernel tree as IMX.
So let's merge the entry into IMX one.

Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 25d11631
Loading
Loading
Loading
Loading
+1 −7
Original line number Original line Diff line number Diff line
@@ -943,16 +943,10 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
S:	Maintained
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
F:	arch/arm/mach-imx/
F:	arch/arm/mach-imx/
F:	arch/arm/mach-mxs/
F:	arch/arm/boot/dts/imx*
F:	arch/arm/boot/dts/imx*
F:	arch/arm/configs/imx*_defconfig
F:	arch/arm/configs/imx*_defconfig


ARM/FREESCALE MXS ARM ARCHITECTURE
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-mxs/

ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
M:	Lennert Buytenhek <kernel@wantstofly.org>
M:	Lennert Buytenhek <kernel@wantstofly.org>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)