aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-08-07 03:55:05 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-08-07 03:55:05 -0700
commit975a605c43b8027a5194506b5a0a4964e085b08a (patch)
treeccbd5fb4b2f22ff24c4d32afbc9399c9db478bdf /MAINTAINERS
parent9c89bd10c8097525ce9570550e672d01511f0f45 (diff)
parent40fe76657d0a50413fd59c6faa8a8a7f0cba59c8 (diff)
downloadhistory-975a605c43b8027a5194506b5a0a4964e085b08a.tar.gz
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b6e99e396193e6..7e98b242ae60d3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -478,7 +478,7 @@ S: Maintained
CYCLADES 2X SYNC CARD DRIVER
P: Arnaldo Carvalho de Melo
M: acme@conectiva.com.br
-W: http://www.conectiva.com.br/~acme
+W: http://advogato.org/person/acme
L: cycsyn-devel@bazar.conectiva.com.br
S: Maintained
@@ -2185,6 +2185,12 @@ M: zaga@fly.cc.fer.hr
L: linux-scsi@vger.kernel.org
S: Maintained
+WL3501 WIRELESS PCMCIA CARD DRIVER
+P: Arnaldo Carvalho de Melo
+M: acme@conectiva.com.br
+W: http://advogato.org/person/acme
+S: Maintained
+
X.25 NETWORK LAYER
P: Henner Eisen
M: eis@baty.hanse.de