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

Commit fed9b63c authored Feb 10, 2010 by Sascha Hauer

Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master

parents d2831d1f 3d48e1d0

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -663,6 +663,12 @@ T: git://git.pengutronix.de/git/imx/linux-2.6.git
		F: arch/arm/mach-mx*/
		F: arch/arm/plat-mxc/

		ARM/FREESCALE IMX51
		M: Amit Kucheria <amit.kucheria@canonical.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm/mach-mx5/

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

arch/arm/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1
		machine-$(CONFIG_ARCH_MX2) := mx2
		machine-$(CONFIG_ARCH_MX25) := mx25
		machine-$(CONFIG_ARCH_MX3) := mx3
		machine-$(CONFIG_ARCH_MX5) := mx5
		machine-$(CONFIG_ARCH_NETX) := netx
		machine-$(CONFIG_ARCH_NOMADIK) := nomadik
		machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx