]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:54:56 +0000 (11:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:54:56 +0000 (11:54 +1100)
commit9b55394ea638032b8cc6484d09c8e050ce043477
treee2edc687035ef2a3ee64476db902294d6f6013a3
parent9edb992d5fea413c1c55c54fa94d450a09ff98b8
parent087a45b74e0228a24b61580f7f1f3bcf4c971774
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx6qdl.dtsi
arch/arm/boot/dts/imx6sl.dtsi