]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch '4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:39:04 +0000 (11:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:39:04 +0000 (11:39 +1100)
commitfbcf9fd0661c8edbde39d0142a57e6fd57005ed1
treed11e8395707a7ad91599eb7381a853873a8f833f
parent77dc7e1fd4bc155c46bd28e9d7735a0e3dfe1d86
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