From: Mark Brown <broonie@linaro.org>
Date: Wed, 14 May 2014 11:52:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d1203f29199a1d754bd1ca335c3dc6b14be160b;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

0d1203f29199a1d754bd1ca335c3dc6b14be160b