Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 22:05:33 +0000 (15:05 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 22:05:33 +0000 (15:05 -0700)

Trivial merge