Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix...
authorMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:21:57 +0000 (21:21 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:21:57 +0000 (21:21 +0000)

Trivial merge