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)
commit973c1fabc70deb10f12a0eaab2f50c2263784257
tree5b0ef183757049d241d0709f0cea9e370627b687
parent4383162c8f2fa75d916c4901b0d1ebcac7aeaf74
parentd10f73480b991da2aa1c000ed38eda3e4a987292
Merge branch 'for_paulus' of /linux/kernel/git/galak/powerpc
arch/powerpc/Kconfig
include/asm-powerpc/cputable.h