Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 52e95780bd877898cc17f3a38a1e039f5ba3d4e8..03b9fb9575487904b8eb70ce268dc47b74dc1cca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -635,7 +635,7 @@ P:  Dirk Opfer
 M:     dirk@opfer-online.de
 S:     Maintained
 
-ARM/PALMTX SUPPORT
+ARM/PALMTX,PALMT5,PALMLD SUPPORT
 P:     Marek Vasut
 M:     marek.vasut@gmail.com
 W:     http://hackndev.com
@@ -3552,6 +3552,22 @@ M:       linux@arm.linux.org.uk
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+PXA168 SUPPORT
+P:     Eric Miao
+M:     eric.miao@marvell.com
+P:     Jason Chagas
+M:     jason.chagas@marvell.com
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+T:     git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+S:     Supported
+
+PXA910 SUPPORT
+P:     Eric Miao
+M:     eric.miao@marvell.com
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+T:     git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+S:     Supported
+
 PXA MMCI DRIVER
 S:     Orphan