Merge remote-tracking branch 'asoc/topic/component' into asoc-multi

author Mark Brown <broonie@linaro.org>

Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)

committer Mark Brown <broonie@linaro.org>

Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
author Mark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
committer Mark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-pcm.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
committer	Mark Brown <broonie@linaro.org>
	Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
		1	2
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-pcm.c	patch \|	diff1 \|	diff2 \|	blob \| history