aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-10-26 14:22:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 16:52:17 -0700
commit838553c5a151f0d76c5558b85d6a4131c835a20c (patch)
treecd9aaa91e88313342806266d3cff09f69454ea47 /MAINTAINERS
parentec15408206e6b87a11dc1560b2bd758d2ad7ccb1 (diff)
downloadmrst-s0i3-test-838553c5a151f0d76c5558b85d6a4131c835a20c.tar.gz
mrst-s0i3-test-838553c5a151f0d76c5558b85d6a4131c835a20c.tar.xz
mrst-s0i3-test-838553c5a151f0d76c5558b85d6a4131c835a20c.zip
MAINTAINERS: merge imote2 and stargate
Removed by commit dcd925f95194da4 ("pxa: merge stargate2 and imote2 board files"). Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Eric Miao <eric.y.miao@gmail.com> 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--MAINTAINERS8
1 files changed, 1 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a8d1f5686ce..5bb0f896bc2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -757,13 +757,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-ixp4xx/
-ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
-M: Jonathan Cameron <jic23@cam.ac.uk>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-F: arch/arm/mach-pxa/imote2.c
-
-ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
M: Jonathan Cameron <jic23@cam.ac.uk>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained