Merge remote-tracking branch 'asoc/topic/component' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:15 +0000 (16:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:15 +0000 (16:31 +0100)
1  2 
sound/soc/codecs/wm_adsp.c
sound/soc/soc-pcm.c

Simple merge
Simple merge