Merge branch 'pxa' into devel

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

diff --git a/MAINTAINERS b/MAINTAINERS
index e6c06fa3290e3061abd7cdf0db4187d5cb6e0d14..3d72cbbc579df122023bd3aef6b15d218d0cdf9a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -475,11 +475,28 @@ M:        kernel@wantstofly.org
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
+ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+P:     Mike Rapoport
+M:     mike@compulab.co.il
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:     Maintained
+
 ARM/CORGI MACHINE SUPPORT
 P:     Richard Purdie
 M:     rpurdie@rpsys.net
 S:     Maintained
 
+ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
+P:     Daniel Ribeiro
+M:     drwyrm@gmail.com
+P:     Stefan Schmidt
+M:     stefan@openezx.org
+P:     Harald Welte
+M:     laforge@openezx.org
+L:     openezx-devel@lists.openezx.org (subscribers-only)
+W:     http://www.openezx.org/
+S:     Maintained
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 P:     Lennert Buytenhek
 M:     kernel@wantstofly.org
@@ -567,10 +584,18 @@ L:        linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
 
 ARM/TOSA MACHINE SUPPORT
+P:     Dmitry Baryshkov
+M:     dbaryshkov@gmail.com
 P:     Dirk Opfer
 M:     dirk@opfer-online.de
 S:     Maintained
 
+ARM/PALMTX SUPPORT
+P:     Marek Vasut
+M:     marek.vasut@gmail.com
+W:     http://hackndev.com
+S:     Maintained
+
 ARM/PLEB SUPPORT
 P:     Peter Chubb
 M:     pleb@gelato.unsw.edu.au