Merge branch 'dma' into devel

diff --cc arch/arm/mach-footbridge/dma.c
Simple merge
diff --cc arch/arm/plat-mxc/dma-mx1-mx2.c
Simple merge
		1	2
arch/arm/mach-footbridge/dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/dma-mx1-mx2.c	patch \|	diff1 \|	diff2 \|	blob \| history