Skip to content
Commit 7d9d43ac authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/edma' into for-linus 



Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>

Conflicts:
	drivers/dma/edma.c
parents 6df056d8 e3faf2b8
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment