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)
1  2 
sound/soc/soc-dapm.c

Simple merge