From: Mark Brown <broonie@linaro.org>
Date: Mon, 4 Aug 2014 15:31:40 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic... 
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~144^2~5^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7177999dc0f70000a6c54f77f2fa96abf9320a2;p=pandora-kernel.git

Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic/fsl-spdif' and 'asoc/topic/imx-audmux' into asoc-next
---

e7177999dc0f70000a6c54f77f2fa96abf9320a2
Reading git-diff-tree failed