Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index df3fa0e..0652ab3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3533,7 +3533,7 @@ S:        Supported
 
 S390 NETWORK DRIVERS
 P:     Ursula Braun
-M:     ubraun@linux.vnet.ibm.com
+M:     ursula.braun@de.ibm.com
 P:     Frank Blaschka
 M:     blaschka@linux.vnet.ibm.com
 M:     linux390@de.ibm.com
@@ -3553,7 +3553,7 @@ S:        Supported
 
 S390 IUCV NETWORK LAYER
 P:     Ursula Braun
-M:     ubraun@linux.vnet.ibm.com
+M:     ursula.braun@de.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -4047,9 +4047,10 @@ W:       http://www.buzzard.org.uk/toshiba/
 S:     Maintained
 
 TPM DEVICE DRIVER
-P:     Debora Velarde
-P:     Rajiv Andrade
-M:     tpmdd-devel@lists.sourceforge.net
+P:     Debora Velarde
+M:     debora@linux.vnet.ibm.com
+P:     Rajiv Andrade
+M:     srajiv@linux.vnet.ibm.com
 W:     http://tpmdd.sourceforge.net
 P:     Marcel Selhorst
 M:     tpm@selhorst.net