]> Pileus Git - ~andy/linux/commit
Merge branch 'topic/sh' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 2 Sep 2013 12:12:35 +0000 (17:42 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 2 Sep 2013 12:12:35 +0000 (17:42 +0530)
commit265d9c673d47fcd5812d69dc07104b706285de56
treeebb686a2ecbf702c4a5cab975cf86fbc10dac5e7
parent592745e2f8afbaeafcf72645f0a2b0285644e091
parente5ffa401eacd0e74178e20ba932200fc9fe41c07
Merge branch 'topic/sh' into for-linus

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

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/sh/Kconfig
drivers/dma/sh/Makefile
drivers/dma/sh/shdma-of.c
drivers/dma/sh/shdmac.c
drivers/dma/sh/sudmac.c