aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
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 /CREDITS
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 'CREDITS')
-rw-r--r--CREDITS15
1 files changed, 13 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 29291aee15f7bf..feb0b30695d90a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2107,14 +2107,16 @@ S: Germany
N: Arnaldo Carvalho de Melo
E: acme@conectiva.com.br
+E: acme@kernel.org
E: acme@gnu.org
-W: http://bazar.conectiva.com.br/~acme
+W: http://bazar2.conectiva.com.br/~acme
W: http://advogato.org/person/acme
P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
D: wanrouter hacking
D: misc Makefile, Config.in, drivers and network stacks fixes
-D: IPX Maintainer
+D: IPX & LLC network stacks maintainer
D: Cyclom 2X synchronous card driver
+D: wl3501 PCMCIA wireless card driver
D: i18n for minicom, net-tools, util-linux, fetchmail, etc
S: Conectiva S.A.
S: R. Tocantins, 89 - Cristo Rei
@@ -2360,6 +2362,15 @@ S: Zum Schiersteiner Grund 2
S: 55127 Mainz
S: Germany
+N: Gustavo Niemeyer
+E: niemeyer@conectiva.com
+W: https://moin.conectiva.com.br/GustavoNiemeyer
+D: wl3501 PCMCIA wireless card initial support for wireless extensions in 2.4
+S: Conectiva S.A.
+S: R. Tocantins 89
+S: 80050-430 Curitiba PR
+S: Brazil
+
N: David C. Niemi
E: niemi@tux.org
W: http://www.tux.org/~niemi/