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

author Mark Brown <broonie@kernel.org>

Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)

committer Mark Brown <broonie@kernel.org>

Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
author Mark Brown <broonie@kernel.org>
Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
committer Mark Brown <broonie@kernel.org>
Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
committer	Mark Brown <broonie@kernel.org>
	Tue, 10 Oct 2017 09:23:08 +0000 (10:23 +0100)
		1	2
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history