]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@linaro.org>
Tue, 27 May 2014 19:55:19 +0000 (20:55 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 27 May 2014 19:55:19 +0000 (20:55 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge