From: Mark Brown <broonie@linaro.org>
Date: Thu, 26 Sep 2013 11:05:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~14^2^2~34^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8f00c1b01c8b547bd1e11754634ce1913c7cc72;p=pandora-kernel.git

Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm

Conflicts:
	sound/soc/fsl/imx-sgtl5000.c
---

e8f00c1b01c8b547bd1e11754634ce1913c7cc72
Reading git-diff-tree failed