Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 4 Nov 2013 06:04:12 +0000 (22:04 -0800)
committerMark Brown <broonie@linaro.org>
Mon, 4 Nov 2013 06:04:12 +0000 (22:04 -0800)
commit41caa416341528d104294daa95244cc1eeb754ff
treecc3d5a45d49e6a3403e3d284903debe7f783541e
parentca89bc248e2fac44d6374a48b8d38b068c7a1bdf
parent298402a3858e17e6a78acafa1dcd490167dd9f74
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
sound/soc/soc-dapm.c