diff --git a/[refs] b/[refs] index 223d702c963e..b5f2f7d0e63e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a77b8d0744ab21b59a9413c41c6a3d6cb9b0b4f +refs/heads/master: d48d38e87c2ce56dcee030a8bcd5e9e1090c232f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 03f38c18f323..9d7e056cb14c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -935,6 +935,16 @@ W: http://www.fluff.org/ben/linux/ S: Maintained F: arch/arm/mach-s3c6410/ +ARM/SHMOBILE ARM ARCHITECTURE +M: Paul Mundt +M: Magnus Damm +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 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)