diff --git a/[refs] b/[refs]
index 50e0ae430901..e37d1862741e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec15408206e6b87a11dc1560b2bd758d2ad7ccb1
+refs/heads/master: 838553c5a151f0d76c5558b85d6a4131c835a20c
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index a8d1f5686cee..5bb0f896bc24 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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