diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 15:08:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 15:08:16 -0800 |
commit | 097916ecafd3bbedbde3ba068522093bf72319b3 (patch) | |
tree | 95b8f52826883ccb04086725f0b94186adc1566f /MAINTAINERS | |
parent | 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c (diff) | |
parent | 29f8f63272bd286549d1c7f75ad22686191d35d8 (diff) | |
download | op-kernel-dev-097916ecafd3bbedbde3ba068522093bf72319b3.zip op-kernel-dev-097916ecafd3bbedbde3ba068522093bf72319b3.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ff16eac..e6dbb21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1398,7 +1398,7 @@ IRDA SUBSYSTEM P: Jean Tourrilhes L: irda-users@lists.sourceforge.net (subscribers-only) W: http://irda.sourceforge.net/ -S: Maintained +S: Odd Fixes ISAPNP P: Jaroslav Kysela @@ -1843,7 +1843,14 @@ M: yoshfuji@linux-ipv6.org P: Patrick McHardy M: kaber@coreworks.de L: netdev@vger.kernel.org -T: git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git +T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git +S: Maintained + +NETWORKING [WIRELESS] +P: John W. Linville +M: linville@tuxdriver.com +L: netdev@vger.kernel.org +T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git S: Maintained IPVS @@ -2536,11 +2543,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/ |