diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-30 11:51:31 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-30 11:52:02 -0500 |
commit | 0a9995e46f3f9cb28360c89892b939420ac3fa2e (patch) | |
tree | ea8531e1d08cd168ab08b39885f2a3ef543bb91c /MAINTAINERS | |
parent | 90870483ac58314b8036aeb60014030996734602 (diff) | |
parent | 5e2125985045270564f84ce8891a0453320f27cb (diff) |
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
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 | |||
1122 | F: drivers/media/platform/s5p-tv/ | 1122 | F: drivers/media/platform/s5p-tv/ |
1123 | 1123 | ||
1124 | ARM/SHMOBILE ARM ARCHITECTURE | 1124 | ARM/SHMOBILE ARM ARCHITECTURE |
1125 | M: Paul Mundt <lethal@linux-sh.org> | 1125 | M: Simon Horman <horms@verge.net.au> |
1126 | M: Magnus Damm <magnus.damm@gmail.com> | 1126 | M: Magnus Damm <magnus.damm@gmail.com> |
1127 | L: linux-sh@vger.kernel.org | 1127 | L: linux-sh@vger.kernel.org |
1128 | W: http://oss.renesas.com | 1128 | W: http://oss.renesas.com |
1129 | Q: http://patchwork.kernel.org/project/linux-sh/list/ | 1129 | Q: http://patchwork.kernel.org/project/linux-sh/list/ |
1130 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest | 1130 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next |
1131 | S: Supported | 1131 | S: Supported |
1132 | F: arch/arm/mach-shmobile/ | 1132 | F: arch/arm/mach-shmobile/ |
1133 | F: drivers/sh/ | 1133 | F: drivers/sh/ |