Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix...
authorMark Brown <broonie@linaro.org>
Mon, 24 Mar 2014 11:16:27 +0000 (11:16 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 24 Mar 2014 11:16:27 +0000 (11:16 +0000)

Trivial merge