Merge remote-tracking branch 'asoc/topic/component' into asoc-multi
authorMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
1  2 
sound/soc/soc-core.c
sound/soc/soc-pcm.c

Simple merge
Simple merge