Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:21:56 +0000 (21:21 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:21:56 +0000 (21:21 +0000)

Trivial merge