aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-30 08:51:31 -0800
committerOlof Johansson <olof@lixom.net>2012-11-30 08:52:02 -0800
commit0a9995e46f3f9cb28360c89892b939420ac3fa2e (patch)
treeea8531e1d08cd168ab08b39885f2a3ef543bb91c
parentMerge tag 'ixp4xx_fixes_for_3.7' of git://git.infradead.org/users/jcooper/linux into fixes (diff)
parentUpdate ARM/SHMOBILE section of MAINTAINERS (diff)
downloadlinux-dev-0a9995e46f3f9cb28360c89892b939420ac3fa2e.tar.xz
linux-dev-0a9995e46f3f9cb28360c89892b939420ac3fa2e.zip
Merge branch 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
From Simon Horman: * 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: Update ARM/SHMOBILE section of MAINTAINERS Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bb0b27db673f..50ac8920c246 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1122,12 +1122,12 @@ S: Maintained
F: drivers/media/platform/s5p-tv/
ARM/SHMOBILE ARM ARCHITECTURE
-M: Paul Mundt <lethal@linux-sh.org>
+M: Simon Horman <horms@verge.net.au>
M: Magnus Damm <magnus.damm@gmail.com>
L: linux-sh@vger.kernel.org
W: http://oss.renesas.com
Q: http://patchwork.kernel.org/project/linux-sh/list/
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
S: Supported
F: arch/arm/mach-shmobile/
F: drivers/sh/