]> 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)
commitdb18c94806097307a81f8de806d99e369ca27324
treee0ad000924e9875bd2ea17bd0e04382491765a09
parent6a3a9df9c32b728231c8aa7be6b9b9984466070c
parent21f7bf4e0b987c431d31f71d77a4aa0735b05bc5
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