Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 20 Jan 2014 11:50:41 +0000 (11:50 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 20 Jan 2014 11:50:41 +0000 (11:50 +0000)
1  2 
include/sound/soc.h
sound/soc/soc-pcm.c

Simple merge
Simple merge