Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

author Paul Mackerras <paulus@samba.org>

Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)

committer Paul Mackerras <paulus@samba.org>

Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)
author Paul Mackerras <paulus@samba.org>
Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)
committer Paul Mackerras <paulus@samba.org>
Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/powerpc/kernel/misc_64.S
Simple merge
diff --cc drivers/char/hvc_iseries.c
Simple merge
author	Paul Mackerras <paulus@samba.org>
	Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)
committer	Paul Mackerras <paulus@samba.org>
	Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)
		1	2
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/misc_64.S	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/hvc_iseries.c	patch \|	diff1 \|	diff2 \|	blob \| history