Merge remote-tracking branch 'asoc/fix/dapm' into asoc-dapm
authorMark Brown <broonie@linaro.org>
Tue, 13 Aug 2013 09:19:52 +0000 (10:19 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 13 Aug 2013 09:19:52 +0000 (10:19 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge