---

yaml --- r: 26708 b: refs/heads/master c: 2e367a8 h: refs/heads/master v: v3
git-mirror · May 15, 2006 · 6d9b74e · 6d9b74e
1 parent aa09ffb
commit 6d9b74e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e376613899076396d0c97de67ad072587267370
+refs/heads/master: 2e367a82fc2da335455984a7722c721dd3fa782b
diff --git a/trunk/CREDITS b/trunk/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/trunk/MAINTAINERS b/trunk/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