Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
1  2 
sound/soc/soc-pcm.c

Simple merge