]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
authorMark Brown <broonie@linaro.org>
Tue, 20 Aug 2013 10:24:40 +0000 (11:24 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 20 Aug 2013 10:24:40 +0000 (11:24 +0100)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge