summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-12 08:40:13 +1000
committerPaul Mackerras <paulus@samba.org>2007-10-12 08:40:13 +1000
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 4dbfa738b7e..559c5fc8645 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2288,6 +2288,8 @@ S: Maintained
LINUX FOR POWERPC EMBEDDED MPC52XX
P: Sylvain Munaut
M: tnt@246tNt.com
+P: Grant Likely
+M: grant.likely@secretlab.ca
W: http://www.246tNt.com/mpc52xx/
W: http://www.penguinppc.org/
L: linuxppc-dev@ozlabs.org