Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

author Mark Brown <broonie@kernel.org>

Fri, 26 Jan 2018 15:26:51 +0000 (15:26 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 26 Jan 2018 15:26:51 +0000 (15:26 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:51 +0000 (15:26 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:51 +0000 (15:26 +0000)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 26 Jan 2018 15:26:51 +0000 (15:26 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 26 Jan 2018 15:26:51 +0000 (15:26 +0000)
		1	2
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history