]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
MAINTAINERS: merge s3c6400 and 6410 to 64xx
authorJoe Perches <joe@perches.com>
Tue, 26 Oct 2010 21:23:01 +0000 (14:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 23:52:18 +0000 (16:52 -0700)
Removed by commit 431107ea5b680a24a ("ARM: S3C64XX: Merge mach-s3c6400 and
mach-s3c6410").

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>
MAINTAINERS

index feda2cff24fff31c1c0086a799cdf9be2062adf5..abf4436a3741399c69279deef198e460d01a77de 100644 (file)
@@ -930,19 +930,12 @@ S:        Maintained
 F:     arch/arm/mach-s3c2440/
 F:     arch/arm/mach-s3c2443/
 
-ARM/S3C6400 ARM ARCHITECTURE
+ARM/S3C64xx 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-s3c6400/
-
-ARM/S3C6410 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-s3c6410/
+F:     arch/arm/mach-s3c64xx/
 
 ARM/S5P ARM ARCHITECTURES
 M:     Kukjin Kim <kgene.kim@samsung.com>