diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 14:23:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 14:23:54 -0800 |
| commit | 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f (patch) | |
| tree | 8107ee11c3fe7d3b4be36054af4475326af86d53 /MAINTAINERS | |
| parent | ad12583f46bcb6ce93ccd99fa063c0d701146b2e (diff) | |
| parent | 4323add67792ced172d0d93b8b2e6187023115f1 (diff) | |
Merge git://tipc.cslab.ericsson.net/pub/git/tipc
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f98955ed5033..c4d0e5913b42 100644 --- 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/ |