Merge git://tipc.cslab.ericsson.net/pub/git/tipc

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

diff --git a/MAINTAINERS b/MAINTAINERS
index f98955ed5033753eb6bb60f9531ac65ec6916224..c4d0e5913b425a1ba370ab0cb4f3aa34708934b1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2536,11 +2536,11 @@ S:     Maintained
 
 TIPC NETWORK LAYER
 P:     Per Liden
-M:     per.liden@nospam.ericsson.com
+M:     per.liden@ericsson.com
 P:     Jon Maloy
-M:     jon.maloy@nospam.ericsson.com
+M:     jon.maloy@ericsson.com
 P:     Allan Stephens
-M:     allan.stephens@nospam.windriver.com
+M:     allan.stephens@windriver.com
 L:     tipc-discussion@lists.sourceforge.net
 W:     http://tipc.sourceforge.net/
 W:     http://tipc.cslab.ericsson.net/