Skip to content
Commit 1f3d6dc0 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'rmk_cookie_fixes2' into next 



Conflicts:
	drivers/dma/imx-dma.c
	drivers/dma/pl330.c

Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parents 5170c051 949ff5b8
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