Merge remote-tracking branch 'lsk/v3.10/topic/asoc-compress' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 19:14:27 +0000 (20:14 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 19:14:27 +0000 (20:14 +0100)
1  2 
sound/soc/soc-compress.c
sound/soc/soc-pcm.c

Simple merge
Simple merge