aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 12:34:50 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 12:34:50 -0500
commit677f4f64e4b2336682f0e15c69b206ade6f6b131 (patch)
tree83b1f3e1f0de4c569e6c5adcf5e9934e6254f4e6 /MAINTAINERS
parent4567c4a89693416ccca02d32109bce967e9c1ade (diff)
parentfedea672a3aab3b99d03e69805ee423c73af1961 (diff)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 54f7d4afdbb..d13e2e33d40 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -637,6 +637,9 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
637M: Sascha Hauer <kernel@pengutronix.de> 637M: Sascha Hauer <kernel@pengutronix.de>
638L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 638L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
639S: Maintained 639S: Maintained
640T: git://git.pengutronix.de/git/imx/linux-2.6.git
641F: arch/arm/mach-mx*/
642F: arch/arm/plat-mxc/
640 643
641ARM/GLOMATION GESBC9312SX MACHINE SUPPORT 644ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
642M: Lennert Buytenhek <kernel@wantstofly.org> 645M: Lennert Buytenhek <kernel@wantstofly.org>