]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mpc5xxx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:07:38 +0000 (11:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:07:38 +0000 (11:07 +1100)
Conflicts:
arch/powerpc/boot/dts/mpc5125twr.dts

1  2 
arch/powerpc/Kconfig
arch/powerpc/boot/dts/mpc5121.dtsi
drivers/spi/spi-mpc512x-psc.c

Simple merge
Simple merge
Simple merge