]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch '4xx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:12:23 +0000 (11:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:12:23 +0000 (11:12 +1100)
commit1fa4a40497fb2450072acb06d8aec1ce186d4dea
treef98d716e1eea843e8a921c3bca811bc1d2536950
parent3debb9264b1359ab2bc22ee2b39b5895e911a14c
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