]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 25 Apr 2014 11:12:13 +0000 (12:12 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Apr 2014 11:12:13 +0000 (12:12 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge