]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 03:17:09 +0000 (14:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 03:17:09 +0000 (14:17 +1100)
commit1efe709fc5b39e2bba2203d80676ce578ed61637
tree4f353c0773451df4d9215eeb786d656ee6f3b27e
parent84d33d95792274db1ce9365c3e207ff559893bde
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
drivers/dma/pl330.c