Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for...
authorPaul Mackerras <paulus@samba.org>
Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
1  2 
arch/powerpc/Kconfig
arch/powerpc/platforms/Kconfig
arch/powerpc/platforms/Kconfig.cputype
drivers/serial/Kconfig

Simple merge
Simple merge
Simple merge