From: Mark Brown <broonie@linaro.org>
Date: Thu, 4 Jul 2013 17:30:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
X-Git-Tag: v3.11-rc1~23^2~2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=986a622df307644af14618bee54c901aa74816da;p=users%2Fwilly%2Flinux.git

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

986a622df307644af14618bee54c901aa74816da