Merge remote-tracking branches 'asoc/fix/audmux', 'asoc/fix/cs42l52', 'asoc/fix/fsl...
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:49:10 +0000 (12:49 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:49:10 +0000 (12:49 +0100)

Trivial merge