Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 10 Mar 2014 11:30:55 +0000 (11:30 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 10 Mar 2014 11:30:55 +0000 (11:30 +0000)

Trivial merge