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

Merge branch 'for-linus' into next 



Conflicts:
	drivers/dma/edma.c
Moved the memory leak fix post merge

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parents 959f5854 2abd5f1b
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