diff --git a/[refs] b/[refs] index a1918f3ea787..e7de0553fad4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16cb4b333c9e7a00ce3b1d74ec0c9b4c2e956910 +refs/heads/master: 7c2b2aaee45c365596a83bcf8758b1f222e0eca4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6d1b048c62a1..a731fbfefb03 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2534,11 +2534,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/