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

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
---

8e9c4aa4e7bd600d30e15ec82be9b670a1ec3da9
Reading git-diff-tree failed