From: Mark Brown <broonie@linaro.org>
Date: Wed, 11 Sep 2013 10:17:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
X-Git-Tag: v3.12-rc1~43^2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c34c0d7684b8b79666da6b1bc37fc330cd0dd216;p=users%2Fjedix%2Flinux-maple.git

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

c34c0d7684b8b79666da6b1bc37fc330cd0dd216