commit 2e367a82fc2da335455984a7722c721dd3fa782b
author Marcelo Tosatti <marcelo@kvack.org> Mon May 15 09:44:08 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon May 15 11:20:55 2006 -0700
tree c2d1030acacd80fe96e7a483bccad3b1702e5c86
parent 5e376613899076396d0c97de67ad072587267370

[PATCH] Marcelo has moved

Signed-off-by: Marcelo Tosatti <marcelo@kvack.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CREDITS

diff --git a/CREDITS b/CREDITS
index 6f50be3..9bf714a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3241,14 +3241,9 @@
 S: Beaverton, Oregon 97005
 S: USA
 
-N: Marcelo W. Tosatti
-E: marcelo.tosatti@cyclades.com
-D: Miscellaneous kernel hacker
+N: Marcelo Tosatti
+E: marcelo@kvack.org
 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