Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

author Mark Brown <broonie@linaro.org>

Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)

committer Mark Brown <broonie@linaro.org>

Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
author Mark Brown <broonie@linaro.org>
Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
committer Mark Brown <broonie@linaro.org>
Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
committer	Mark Brown <broonie@linaro.org>
	Wed, 7 May 2014 09:21:22 +0000 (10:21 +0100)
		1	2
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history