From: Mark Brown <broonie@linaro.org>
Date: Thu, 15 Aug 2013 10:37:38 +0000 (+0100)
Subject: Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v3.12-rc1~150^2~9^2~31^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=743c5bb898be45009770c144e5e14e4f448e56b9;p=pandora-kernel.git

Merge branch 'topic/dma' of git://git./linux/kernel/git/broonie/sound into asoc-omap

Conflicts:
	sound/soc/omap/Kconfig
---

743c5bb898be45009770c144e5e14e4f448e56b9
Reading git-diff-tree failed