From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 2 Sep 2013 12:12:35 +0000 (+0530)
Subject: Merge branch 'topic/sh' into for-linus
X-Git-Tag: v3.12-rc1~68^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=265d9c673d47fcd5812d69dc07104b706285de56;p=pandora-kernel.git

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>
---

265d9c673d47fcd5812d69dc07104b706285de56
Reading git-diff-tree failed