linux-next: manual merge of the slave-dma tree with the imx-mxs tree

Hi Vinod, Today's linux-next merge of the slave-dma tree got a conflict in arch/arm/boot/dts/imx53.dtsi between commit a0cd556100d0 ("ARM: imx53: use clock defines in DTS files") from the imx-mxs tree and commit 786f0db6d439 ("ARM: dts: imx: use dual-fifo sdma script for ssi") from the slave-dma

linux-next: manual merge of the slave-dma tree with the imx-mxs tree

Hi Vinod, Today's linux-next merge of the slave-dma tree got a conflict in arch/arm/boot/dts/imx51.dtsi between commit 975bbc1e679b ("ARM: imx51: use clock defines in DTS files") from the imx-mxs tree and commit 786f0db6d439 ("ARM: dts: imx: use dual-fifo sdma script for ssi") from the slave-dma

linux-next: manual merge of the slave-dma tree with the imx-mxs tree

Hi Vinod, Today's linux-next merge of the slave-dma tree got a conflict in arch/arm/boot/dts/imx51.dtsi between commit 975bbc1e679b (ARM: imx51: use clock defines in DTS files) from the imx-mxs tree and commit 786f0db6d439 (ARM: dts: imx: use dual-fifo sdma script for ssi) from the slave-dma

linux-next: manual merge of the slave-dma tree with the imx-mxs tree

Hi Vinod, Today's linux-next merge of the slave-dma tree got a conflict in arch/arm/boot/dts/imx53.dtsi between commit a0cd556100d0 (ARM: imx53: use clock defines in DTS files) from the imx-mxs tree and commit 786f0db6d439 (ARM: dts: imx: use dual-fifo sdma script for ssi) from the slave-dma