]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch '4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:17:41 +0000 (12:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:17:41 +0000 (12:17 +1100)
commit052e678e684592e10188684be5f8e318542745b4
treecbc99363eeba7a0477fb712105e40f5cfcfd73f1
parent41cec127fdc98bb23a021053e5bb493d2c5cfef8
parent228d55053397e6d5325ca179c7ffe331de2846d3
Merge remote-tracking branch '4xx/next'

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