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

Merge branch 'topic/of' into for-linus 



Conflicts:
	drivers/dma/mmp_pdma.c

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parents 4fce628f 8010dad5
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