git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 592745e e5ffa40)
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)
Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Trivial merge
Pandora Kernel Repository