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)
commit9921b8dc1fb1b6607092d8293cbff0b8e4416c07
treedab43f22056e3643c4b321aff65c0c7068953d24
parent5f856071c77e545f49400e5d7e48ab298d5c57ee
parenta3f2705d8fefdd578eeae9cfb530ba16331d2bad
Merge remote-tracking branch 'lsk/v3.10/topic/asoc-compress' into linux-linaro-lsk
sound/soc/soc-compress.c
sound/soc/soc-pcm.c