aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-27 09:14:13 -0400
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-27 09:14:13 -0400
commitc5fbc3966f48279dbebfde10248c977014aa9988 (patch)
tree0a52f645d89f91952c26b215f460a4ba195ca42c /MAINTAINERS
parent39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff)
parent9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff)
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index aa257301d86b..6d187fb934f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1419,13 +1419,20 @@ W: http://www.penguinppc.org/
1419L: linuxppc-embedded@ozlabs.org 1419L: linuxppc-embedded@ozlabs.org
1420S: Maintained 1420S: Maintained
1421 1421
1422LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE 1422LINUX FOR POWERPC BOOT CODE
1423P: Tom Rini 1423P: Tom Rini
1424M: trini@kernel.crashing.org 1424M: trini@kernel.crashing.org
1425W: http://www.penguinppc.org/ 1425W: http://www.penguinppc.org/
1426L: linuxppc-embedded@ozlabs.org 1426L: linuxppc-embedded@ozlabs.org
1427S: Maintained 1427S: Maintained
1428 1428
1429LINUX FOR POWERPC EMBEDDED PPC8XX
1430P: Marcelo Tosatti
1431M: marcelo.tosatti@cyclades.com
1432W: http://www.penguinppc.org/
1433L: linuxppc-embedded@ozlabs.org
1434S: Maintained
1435
1429LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX 1436LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
1430P: Kumar Gala 1437P: Kumar Gala
1431M: kumar.gala@freescale.com 1438M: kumar.gala@freescale.com