Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:05 +0000 (20:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:05 +0000 (20:57 +0000)

Trivial merge