aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo@kvack.org>2006-05-15 12:44:08 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-15 14:20:55 -0400
commit2e367a82fc2da335455984a7722c721dd3fa782b (patch)
treec2d1030acacd80fe96e7a483bccad3b1702e5c86 /CREDITS
parent5e376613899076396d0c97de67ad072587267370 (diff)
[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>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS9
1 files changed, 2 insertions, 7 deletions
diff --git a/CREDITS b/CREDITS
index 6f50be37fa0f..9bf714a1c7d9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3241,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400
3241S: Beaverton, Oregon 97005 3241S: Beaverton, Oregon 97005
3242S: USA 3242S: USA
3243 3243
3244N: Marcelo W. Tosatti 3244N: Marcelo Tosatti
3245E: marcelo.tosatti@cyclades.com 3245E: marcelo@kvack.org
3246D: Miscellaneous kernel hacker
3247D: v2.4 kernel maintainer 3246D: v2.4 kernel maintainer
3248D: Current pc300/cyclades maintainer
3249S: Cyclades Corporation
3250S: Av Cristovao Colombo, 462. Floresta.
3251S: Porto Alegre
3252S: Brazil 3247S: Brazil
3253 3248
3254N: Stefan Traby 3249N: Stefan Traby