summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
commit64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch)
treea434977a6caa9b41cc0daaf71dbd76ac8693aba6 /MAINTAINERS
parentb93a4afcff7be859e30cad2a305731516057d6cf (diff)
parent17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c16cce63b8ae..776a5a46e351 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -941,6 +941,16 @@ W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c6410/
+ARM/SHMOBILE ARM ARCHITECTURE
+M: Paul Mundt <lethal@linux-sh.org>
+M: Magnus Damm <magnus.damm@gmail.com>
+L: linux-sh@vger.kernel.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
+W: http://oss.renesas.com
+S: Supported
+F: arch/arm/mach-shmobile/
+F: drivers/sh/
+
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)