summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-10-26 23:23:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 01:52:17 +0200
commit85743532a8ffa826edba3d1ca7d8f0dbf3f2a67d (patch)
tree2beb9b81085048ec9922d50832169ada796a6163 /MAINTAINERS
parentMAINTAINERS: merge imote2 and stargate (diff)
downloadlinux-85743532a8ffa826edba3d1ca7d8f0dbf3f2a67d.tar.xz
linux-85743532a8ffa826edba3d1ca7d8f0dbf3f2a67d.zip
MAINTAINERS: merge s3c-244x sections
Removed by commit 70556b143ae4c ("ARM: S3C24XX: Remove old mach-s3c2442"). Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS15
1 files changed, 1 insertions, 14 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5bb0f896bc24..feda2cff24ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -922,25 +922,12 @@ W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c2410/
-ARM/S3C2440 ARM ARCHITECTURE
+ARM/S3C244x ARM ARCHITECTURE
M: Ben Dooks <ben-linux@fluff.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c2440/
-
-ARM/S3C2442 ARM ARCHITECTURE
-M: Ben Dooks <ben-linux@fluff.org>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W: http://www.fluff.org/ben/linux/
-S: Maintained
-F: arch/arm/mach-s3c2442/
-
-ARM/S3C2443 ARM ARCHITECTURE
-M: Ben Dooks <ben-linux@fluff.org>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W: http://www.fluff.org/ben/linux/
-S: Maintained
F: arch/arm/mach-s3c2443/
ARM/S3C6400 ARM ARCHITECTURE