Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:52:41 +0000 (12:52 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 11:52:41 +0000 (12:52 +0100)
commitcf86197ec5655ed1f54f1f7ba34a01d576e3737d
tree9f95ca616e7a789c60a4e6fc17cc85e84bf1c675
parent0d1203f29199a1d754bd1ca335c3dc6b14be160b
parent868a6ca84ee7e547ae01a5e04e232e4a392c50b8
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus