Merge remote-tracking branch 'jwb/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:24:25 +0000 (11:24 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:24:25 +0000 (11:24 +1100)
commit1e7342e7789fa2ca9202701467428726cbcfd649
treee0ad000924e9875bd2ea17bd0e04382491765a09
parent78c5c68a4cf4329d17abfa469345ddf323d4fd62
parent228d55053397e6d5325ca179c7ffe331de2846d3
Merge remote-tracking branch 'jwb/next' into next

Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
arch/powerpc/boot/Makefile
arch/powerpc/boot/wrapper
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/40x/ppc40x_simple.c