]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit7b96f837cb365a9bd5c4e2ad296d26397e01d570
treeb12126bba143878b1d498907fe8c4292c5626fb2
parent4cc1ae30425398d3fdd6af571022d03057b897dc
parent8c699054e9954d1a6fc7ecc18011a6e6fafd99ae
Merge remote-tracking branch 'mpc5xxx/next'

Conflicts:
arch/powerpc/boot/dts/mpc5125twr.dts
arch/powerpc/Kconfig
arch/powerpc/boot/dts/mpc5121.dtsi
drivers/spi/spi-mpc512x-psc.c