]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@linaro.org>
Tue, 30 Jul 2013 12:01:28 +0000 (13:01 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 30 Jul 2013 12:01:28 +0000 (13:01 +0100)
1  2 
sound/soc/codecs/Kconfig
sound/soc/soc-dapm.c

Simple merge
Simple merge