Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 1978fb205bf75b6b00df8f19f6b67ccf879ebeca..4dacdfcdbe6e6ed34a689cf35851503606255942 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1011,6 +1011,8 @@ L:        netdev@vger.kernel.org
 S:     Supported
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
+P:     Matt Carlson
+M:     mcarlson@broadcom.com
 P:     Michael Chan
 M:     mchan@broadcom.com
 L:     netdev@vger.kernel.org
@@ -3646,6 +3648,12 @@ M:       florian.fainelli@telecomint.eu
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+RDS - RELIABLE DATAGRAM SOCKETS
+P:     Andy Grover
+M:     andy.grover@oracle.com
+L:     rds-devel@oss.oracle.com
+S:     Supported
+
 READ-COPY UPDATE (RCU)
 P:     Dipankar Sarma
 M:     dipankar@in.ibm.com
@@ -3737,6 +3745,15 @@ L:       linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 
+S390 ZCRYPT DRIVER
+P:     Felix Beck
+M:     felix.beck@de.ibm.com
+P:     Ralph Wuerthner
+M:     ralph.wuerthner@de.ibm.com
+M:     linux390@de.ibm.com
+L:     linux-s390@vger.kernel.org
+S:     Supported
+
 S390 ZFCP DRIVER
 P:     Christof Schmitt
 M:     christof.schmitt@de.ibm.com