Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 10 Sep 2014 11:21:02 +0000 (12:21 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 10 Sep 2014 11:21:02 +0000 (12:21 +0100)

Trivial merge