Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for...
Paul Mackerras [Thu, 11 Oct 2007 22:40:13 +0000 (08:40 +1000)]
1  2 
MAINTAINERS
arch/powerpc/platforms/52xx/efika.c

diff --cc MAINTAINERS
Simple merge
Simple merge