Commit 22b61a11 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'dma' into devel 

Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c
parents 423145a5 fa4e9989
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment