From: Mark Brown <broonie@linaro.org>
Date: Sun, 1 Jun 2014 13:02:07 +0000 (+0100)
Subject: Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~21^2~24^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=287d414eacaa681413ea89adfa5b3a0d12d2ab1a;p=pandora-kernel.git

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

Conflicts:
	sound/soc/fsl/Kconfig
---

287d414eacaa681413ea89adfa5b3a0d12d2ab1a
Reading git-diff-tree failed