From: Joe Perches <joe@perches.com>
Date: Tue, 26 Oct 2010 21:22:59 +0000 (-0700)
Subject: MAINTAINERS: merge imote2 and stargate
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=838553c5a151f0d76c5558b85d6a4131c835a20c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

diff --git a/MAINTAINERS b/MAINTAINERS
index a8d1f5686cee..5bb0f896bc24 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