Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
authorPaul Mackerras <paulus@samba.org>
Mon, 11 Dec 2006 05:31:42 +0000 (16:31 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 11 Dec 2006 05:31:42 +0000 (16:31 +1100)
1  2 
arch/powerpc/Kconfig
include/asm-powerpc/cputable.h

Simple merge
Simple merge