Merge remote-tracking branch 'asoc/fix/core' into asoc-component
authorMark Brown <broonie@linaro.org>
Sat, 21 Jun 2014 20:33:18 +0000 (21:33 +0100)
committerMark Brown <broonie@linaro.org>
Sat, 21 Jun 2014 20:33:18 +0000 (21:33 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge