]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mpc5xxx/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 00:34:29 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 00:34:29 +0000 (11:34 +1100)
commit6a7c7e559d044fe52884be4a2497e56f81a12c42
tree8566c3b7c4dba19041220a4531ba2b8adf2c6fb7
parentc3002885796f9c0cb0a49618fe7d4066b3405b99
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