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 4a1cfca49685c8d230302aa2c20d794ffac75239..03b9fb9575487904b8eb70ce268dc47b74dc1cca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -502,6 +502,13 @@ P: Richard Purdie
 M:     rpurdie@rpsys.net
 S:     Maintained
 
+ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
+P:     Paulius Zaleckas
+M:     paulius.zaleckas@teltonika.lt
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+T:     git gitorious.org/linux-gemini/mainline.git
+S:     Maintained
+
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 P:     Daniel Ribeiro
 M:     drwyrm@gmail.com
@@ -513,6 +520,12 @@ L: openezx-devel@lists.openezx.org (subscribers-only)
 W:     http://www.openezx.org/
 S:     Maintained
 
+ARM/FARADAY FA526 PORT
+P:     Paulius Zaleckas
+M:     paulius.zaleckas@teltonika.lt
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:     Maintained
+
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 P:     Sascha Hauer
 M:     kernel@pengutronix.de
@@ -622,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
@@ -3539,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
 
@@ -3876,6 +3905,15 @@ L:       linux-ide@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 S:     Supported
 
+SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
+P:     Sathya Perla
+M:     sathyap@serverengines.com
+P:      Subbu Seetharaman
+M:      subbus@serverengines.com
+L:      netdev@vger.kernel.org
+W:      http://www.serverengines.com
+S:      Supported
+
 SFC NETWORK DRIVER
 P:     Steve Hodgson
 P:     Ben Hutchings