diff options
author | Joe Perches <joe@perches.com> | 2010-10-26 17:23:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 19:52:18 -0400 |
commit | f996231b808f889df77561c86c01cee3c45e254e (patch) | |
tree | 8de172207496ff3c63ef1c7e05f505c43920cc96 /MAINTAINERS | |
parent | 85743532a8ffa826edba3d1ca7d8f0dbf3f2a67d (diff) |
MAINTAINERS: merge s3c6400 and 6410 to 64xx
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index feda2cff24ff..abf4436a3741 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -930,19 +930,12 @@ S: Maintained | |||
930 | F: arch/arm/mach-s3c2440/ | 930 | F: arch/arm/mach-s3c2440/ |
931 | F: arch/arm/mach-s3c2443/ | 931 | F: arch/arm/mach-s3c2443/ |
932 | 932 | ||
933 | ARM/S3C6400 ARM ARCHITECTURE | 933 | ARM/S3C64xx ARM ARCHITECTURE |
934 | M: Ben Dooks <ben-linux@fluff.org> | 934 | M: Ben Dooks <ben-linux@fluff.org> |
935 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 935 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
936 | W: http://www.fluff.org/ben/linux/ | 936 | W: http://www.fluff.org/ben/linux/ |
937 | S: Maintained | 937 | S: Maintained |
938 | F: arch/arm/mach-s3c6400/ | 938 | F: arch/arm/mach-s3c64xx/ |
939 | |||
940 | ARM/S3C6410 ARM ARCHITECTURE | ||
941 | M: Ben Dooks <ben-linux@fluff.org> | ||
942 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
943 | W: http://www.fluff.org/ben/linux/ | ||
944 | S: Maintained | ||
945 | F: arch/arm/mach-s3c6410/ | ||
946 | 939 | ||
947 | ARM/S5P ARM ARCHITECTURES | 940 | ARM/S5P ARM ARCHITECTURES |
948 | M: Kukjin Kim <kgene.kim@samsung.com> | 941 | M: Kukjin Kim <kgene.kim@samsung.com> |