aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-04-03 01:03:45 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-04-03 01:03:45 -0800
commit5e4b50795ee8c7659a1181cea4c98712e02ea63e (patch)
treeb4e0f1a19c549bc54e93f4ada5c3b0a0953e58cb /CREDITS
parent893d709002e952c54cce2e140854207a5f7fdcca (diff)
parent6a1a68c8febfc71c895a05a10afe6812b7c77584 (diff)
downloadhistory-5e4b50795ee8c7659a1181cea4c98712e02ea63e.tar.gz
Merge bk://linuxusb.bkbits.net/linus-2.5v2.5.8-pre1
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS8
1 files changed, 5 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 7ac710701c28ce..5bc325becbea58 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2133,7 +2133,7 @@ S: D-37083 Goettingen
S: Germany
N: Thomas Molina
-E: tmolina@home.com
+E: tmolina@cox.net
D: bug fixes, documentation, minor hackery
N: David Mosberger-Tang
@@ -2537,6 +2537,7 @@ S: Germany
N: Thiago Berlitz Rondon
E: maluco@mileniumnet.com.br
+W: http://vivaldi.linuxms.com.br/~maluco
D: Miscellaneous kernel hacker
S: R. Anhanguera, 1487 - Ipiranga
S: 79080-740 - Campo Grande - Mato Grosso do Sul
@@ -3289,9 +3290,10 @@ S: Bellevue, Washington 98007
S: USA
N: Richard Zidlicky
-E: rdzidlic@geocities.com,rdzidlic@cip.informatik.uni-erlangen.de
-W: http://www.geocities.com/SiliconValley/Bay/2602/
+E: rz@linux-m68k.org, rdzidlic@geocities.com
+W: http://www.geocities.com/rdzidlic
D: Q40 port - see arch/m68k/q40/README
+D: various m68k hacks
S: Germany
N: Werner Zimmermann