aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo@kvack.org>2006-05-15 09:44:08 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-15 11:20:55 -0700
commit2e367a82fc2da335455984a7722c721dd3fa782b (patch)
treec2d1030acacd80fe96e7a483bccad3b1702e5c86
parent5e376613899076396d0c97de67ad072587267370 (diff)
downloadlinux-2e367a82fc2da335455984a7722c721dd3fa782b.tar.gz
[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>
-rw-r--r--CREDITS9
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 8 deletions
diff --git a/CREDITS b/CREDITS
index 6f50be37fa0..9bf714a1c7d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3241,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400
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
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e335587141..cf147aed8df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1662,7 +1662,7 @@ S: Maintained
LINUX FOR POWERPC EMBEDDED PPC8XX
P: Marcelo Tosatti
-M: marcelo.tosatti@cyclades.com
+M: marcelo@kvack.org
W: http://www.penguinppc.org/
L: linuxppc-embedded@ozlabs.org
S: Maintained