Merge branch 'topic/sh' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 20 Apr 2015 18:51:14 +0000 (00:21 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 20 Apr 2015 18:51:14 +0000 (00:21 +0530)
commitb53c7582805b10d6a32e88e22d16dc469e66a37a
tree3775742e873f18d005fd8c2187411ead06c0049d
parent7d3beab16dd9eee86bb1a4dd05b51159fc7772f0
parent3cd44dcd35a6618df88c51561290dc02fb35b8e2
Merge branch 'topic/sh' into for-linus
drivers/dma/sh/Kconfig
drivers/dma/sh/Makefile