]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:02:07 +0000 (12:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 01:02:07 +0000 (12:02 +1100)
commit94186ea2a4030851fcd227f65a665d948ee8eb72
tree28a5b8ce8baa52f207819605715ddec481b8981c
parent810ab7f680c40514451be1f20d1df05587619a8c
parentee2d516e235f940aa591a21b80f27f898f7d14b9
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/Kconfig
drivers/dma/pl330.c