]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb70111c3e5efcff4020b02bb1a25960b5253ccd1
treee0ad000924e9875bd2ea17bd0e04382491765a09
parentac966854afd75dd107cd62868f3998c0aa9da0a5
parent5b6e4f78e094e02aa8f4edd825c3dea8b6eedefa
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