aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo.tosatti@cyclades.com>2004-06-17 18:12:29 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-17 18:12:29 -0700
commitd74fb703951e8643b431a5301fdcc68ccebf9f1f (patch)
treea1cb730f7056623f54524aa171cd67c0096a4b1d /CREDITS
parent1dbbf0b8b5664ba61b419bef0fb6a42caf9dedbd (diff)
downloadhistory-d74fb703951e8643b431a5301fdcc68ccebf9f1f.tar.gz
[PATCH] update Marcelo CREDITS info
Update my CREDITS information. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS13
1 files changed, 7 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index a0eb618ca6fd61..ebaff396893300 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3117,12 +3117,13 @@ S: Beaverton, Oregon 97005
S: USA
N: Marcelo W. Tosatti
-E: marcelo@conectiva.com.br
-W: http://bazar.conectiva.com.br/~marcelo/
-D: Miscellaneous kernel hacker (mostly VM/MM work)
-S: Conectiva S.A.
-S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+E: marcelo.tosatti@cyclades.com
+D: Miscellaneous kernel hacker
+D: v2.4 kernel maintainer
+D: Current pc300/cyclades maintainer
+S: Cyclades Corporation
+S: Av Cristovao Colombo, 462. Floresta.
+S: Porto Alegre
S: Brazil
N: Stefan Traby