Merge branch 'dma' into devel
Russell King [Sat, 21 Feb 2009 21:42:50 +0000 (21:42 +0000)]
Conflicts:

arch/arm/plat-mxc/dma-mx1-mx2.c

1  2 
arch/arm/mach-footbridge/dma.c
arch/arm/plat-mxc/dma-mx1-mx2.c

Simple merge
Simple merge