diff options
author | Joe Perches <joe@perches.com> | 2010-10-26 14:23:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 16:52:18 -0700 |
commit | f996231b808f889df77561c86c01cee3c45e254e (patch) | |
tree | 8de172207496ff3c63ef1c7e05f505c43920cc96 | |
parent | 85743532a8ffa826edba3d1ca7d8f0dbf3f2a67d (diff) | |
download | linux-f996231b808f889df77561c86c01cee3c45e254e.tar.bz2 |
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>
-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 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> |