]> err.no Git - linux-2.6/commitdiff
Merge commit 'jwb/jwb-next'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 01:54:57 +0000 (11:54 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 01:54:57 +0000 (11:54 +1000)
1  2 
arch/powerpc/Kconfig
arch/powerpc/boot/Makefile

Simple merge
Simple merge