Merge branch 'dma' into devel

Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c
This commit is contained in:
Russell King 2009-02-21 21:42:50 +00:00 • committed by Russell King
commit 22b61a11fd
13 changed files with 292 additions and 238 deletions