aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2004-10-01 01:27:36 -0700
committerTom Rini <trini@kernel.crashing.org>2004-10-01 01:27:36 -0700
commite8ecd3eda018bf2694ae7c82702fe4a551521d84 (patch)
tree380e4ec1cda9b871621c233c6847954e9d3df4e5 /MAINTAINERS
parent739c911cd26c6e762d60f846b7f27dc8093c5536 (diff)
parentc613af206f52651d6602a3d226446d9f29f15e2f (diff)
downloadhistory-e8ecd3eda018bf2694ae7c82702fe4a551521d84.tar.gz
Merge bk://bkbits.246tNt.com/linux-2.5-mpc52xx-pending
into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index eb7813b15a6400..05edf5d2f6c5fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1301,6 +1301,15 @@ W: http://www.penguinppc.org/
L: linuxppc-dev@lists.linuxppc.org
S: Maintained
+LINUX FOR POWERPC EMBEDDED MPC52XX
+P: Sylvain Munaut
+M: tnt@246tNt.com
+W: http://www.246tNt.com/mpc52xx/
+W: http://www.penguinppc.org/
+L: linuxppc-dev@ozlabs.org
+L: linuxppc-embedded@ozlabs.org
+S: Maintained
+
LINUX FOR POWERPC EMBEDDED PPC4XX
P: Matt Porter
M: mporter@kernel.crashing.org