Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for...

author Paul Mackerras <paulus@samba.org>

Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)

committer Paul Mackerras <paulus@samba.org>

Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
author Paul Mackerras <paulus@samba.org>
Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
committer Paul Mackerras <paulus@samba.org>
Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/powerpc/platforms/Kconfig
Simple merge
diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge
diff --cc drivers/serial/Kconfig
Simple merge
author	Paul Mackerras <paulus@samba.org>
	Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
committer	Paul Mackerras <paulus@samba.org>
	Thu, 7 Feb 2008 00:21:09 +0000 (11:21 +1100)
		1	2
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/Kconfig.cputype	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history