| commit | 265d9c673d47fcd5812d69dc07104b706285de56 | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@intel.com> | Mon Sep 02 17:42:35 2013 +0530 |
| committer | Vinod Koul <vinod.koul@intel.com> | Mon Sep 02 17:42:35 2013 +0530 |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 | |
| parent | 592745e2f8afbaeafcf72645f0a2b0285644e091 [diff] | |
| parent | e5ffa401eacd0e74178e20ba932200fc9fe41c07 [diff] |
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>