Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:11 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:11 +0000 (17:20 +0100)
commita87c863c7b8e05874887347397b0c687b31d12b8
tree7fafe2acb53db38b5a80eb44047d525dd6282911
parentd48fb4232de0f8a9db7475200663095ef536efff
parentefc77e36ae6ff4394a0232a4f87bded0bd555d6b
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
sound/soc/soc-dapm.c