Public Git Hosting - linux-2.6.git/commit

commit	1e7342e7789fa2ca9202701467428726cbcfd649
author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Fri, 16 Dec 2011 00:24:25 +0000 (16 11:24 +1100)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Fri, 16 Dec 2011 00:24:25 +0000 (16 11:24 +1100)
tree	e0ad000924e9875bd2ea17bd0e04382491765a09	tree \| snapshot (tar.gz zip)
parent	78c5c68a4cf4329d17abfa469345ddf323d4fd62	commit \| diff
parent	228d55053397e6d5325ca179c7ffe331de2846d3	commit \| diff

Merge remote-tracking branch 'jwb/next' into next

Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c

Linus' kernel tree

arch/powerpc/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/boot/wrapper	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/ppc40x_simple.c	diff1 \|	diff2 \|	blob \| history