From: Mark Brown <broonie@linaro.org>
Date: Fri, 8 Nov 2013 10:43:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
X-Git-Tag: v3.13-rc1~122^2^2~52
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3fec948ed815584e562e0aa02e7baf9f970c4910;p=linux.git

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

3fec948ed815584e562e0aa02e7baf9f970c4910