aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS9
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 8 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
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e3355871416..cf147aed8df1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1662,7 +1662,7 @@ S: Maintained
1662 1662
1663LINUX FOR POWERPC EMBEDDED PPC8XX 1663LINUX FOR POWERPC EMBEDDED PPC8XX
1664P: Marcelo Tosatti 1664P: Marcelo Tosatti
1665M: marcelo.tosatti@cyclades.com 1665M: marcelo@kvack.org
1666W: http://www.penguinppc.org/ 1666W: http://www.penguinppc.org/
1667L: linuxppc-embedded@ozlabs.org 1667L: linuxppc-embedded@ozlabs.org
1668S: Maintained 1668S: Maintained