From: Mark Brown <broonie@linaro.org>
Date: Thu, 17 Jul 2014 20:45:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
X-Git-Tag: v3.17-rc2~18^2~4^2~4^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b6c03df8d82f95d15e5ef224edc873a0df1a440;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
---

1b6c03df8d82f95d15e5ef224edc873a0df1a440