aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-11 18:40:13 -0400
committerPaul Mackerras <paulus@samba.org>2007-10-11 18:40:13 -0400
commit895532a166010d8d8b4d58d63d21012eced22492 (patch)
tree708097789ac9cb2670407b12ee37b8653385b5e6 /MAINTAINERS
parentad656887e22390c64276e0a0057541aec701422c (diff)
parente1eea9fa00da50ed3dfb64ce669e9ae0b70c0629 (diff)
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.24
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4dbfa738b7ea..559c5fc8645c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2288,6 +2288,8 @@ S: Maintained
2288LINUX FOR POWERPC EMBEDDED MPC52XX 2288LINUX FOR POWERPC EMBEDDED MPC52XX
2289P: Sylvain Munaut 2289P: Sylvain Munaut
2290M: tnt@246tNt.com 2290M: tnt@246tNt.com
2291P: Grant Likely
2292M: grant.likely@secretlab.ca
2291W: http://www.246tNt.com/mpc52xx/ 2293W: http://www.246tNt.com/mpc52xx/
2292W: http://www.penguinppc.org/ 2294W: http://www.penguinppc.org/
2293L: linuxppc-dev@ozlabs.org 2295L: linuxppc-dev@ozlabs.org