aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@redhat.com>2003-08-06 14:16:45 -0400
committerJeff Garzik <jgarzik@redhat.com>2003-08-06 14:16:45 -0400
commit7a508e5bd44f7db5939f20e079bb9f6e68e53deb (patch)
treeaa8d7a5135d40453c2dc29ba08c2213fa7c384fb /MAINTAINERS
parent6857d83f921b9939556bbd263abee1828e47b480 (diff)
parent87b31d5b6d50d5d6894d4ba3fda2e532f8172645 (diff)
downloadhistory-7a508e5bd44f7db5939f20e079bb9f6e68e53deb.tar.gz
Merge bk://kernel.bkbits.net/acme/wl3501-2.5
into redhat.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4f927612306c9c..e6136ec310dded 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
@@ -2180,6 +2180,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