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

Merge branch 'topic/sh' into for-linus 



Conflicts:
	drivers/dma/sh/Kconfig
	drivers/dma/sh/shdmac.c

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parents 592745e2 e5ffa401
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