Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
authorPaul Mackerras <paulus@samba.org>
Wed, 17 Oct 2007 12:31:13 +0000 (22:31 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 17 Oct 2007 12:31:13 +0000 (22:31 +1000)
1  2 
arch/powerpc/Kconfig
arch/powerpc/platforms/Kconfig

Simple merge
Simple merge