]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
authorMark Brown <broonie@linaro.org>
Wed, 15 Jan 2014 11:48:15 +0000 (11:48 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 15 Jan 2014 11:48:15 +0000 (11:48 +0000)
1  2 
include/sound/soc.h
sound/soc/soc-pcm.c

Simple merge
Simple merge