diff options
-rw-r--r-- | CREDITS | 9 | ||||
-rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 3 insertions, 8 deletions
@@ -3241,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400 | |||
3241 | S: Beaverton, Oregon 97005 | 3241 | S: Beaverton, Oregon 97005 |
3242 | S: USA | 3242 | S: USA |
3243 | 3243 | ||
3244 | N: Marcelo W. Tosatti | 3244 | N: Marcelo Tosatti |
3245 | E: marcelo.tosatti@cyclades.com | 3245 | E: marcelo@kvack.org |
3246 | D: Miscellaneous kernel hacker | ||
3247 | D: v2.4 kernel maintainer | 3246 | D: v2.4 kernel maintainer |
3248 | D: Current pc300/cyclades maintainer | ||
3249 | S: Cyclades Corporation | ||
3250 | S: Av Cristovao Colombo, 462. Floresta. | ||
3251 | S: Porto Alegre | ||
3252 | S: Brazil | 3247 | S: Brazil |
3253 | 3248 | ||
3254 | N: Stefan Traby | 3249 | N: Stefan Traby |
diff --git a/MAINTAINERS b/MAINTAINERS index 5e3355871416..cf147aed8df1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1662,7 +1662,7 @@ S: Maintained | |||
1662 | 1662 | ||
1663 | LINUX FOR POWERPC EMBEDDED PPC8XX | 1663 | LINUX FOR POWERPC EMBEDDED PPC8XX |
1664 | P: Marcelo Tosatti | 1664 | P: Marcelo Tosatti |
1665 | M: marcelo.tosatti@cyclades.com | 1665 | M: marcelo@kvack.org |
1666 | W: http://www.penguinppc.org/ | 1666 | W: http://www.penguinppc.org/ |
1667 | L: linuxppc-embedded@ozlabs.org | 1667 | L: linuxppc-embedded@ozlabs.org |
1668 | S: Maintained | 1668 | S: Maintained |