From: Marcelo Tosatti Signed-off-by: Marcelo Tosatti Signed-off-by: Andrew Morton --- CREDITS | 9 ++------- MAINTAINERS | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff -puN CREDITS~contact-info-update CREDITS --- CREDITS~contact-info-update 2006-05-11 15:17:44.000000000 -0700 +++ devel-akpm/CREDITS 2006-05-11 15:17:44.000000000 -0700 @@ -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 -puN MAINTAINERS~contact-info-update MAINTAINERS --- MAINTAINERS~contact-info-update 2006-05-11 15:17:44.000000000 -0700 +++ devel-akpm/MAINTAINERS 2006-05-11 15:17:44.000000000 -0700 @@ -1661,7 +1661,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 _