Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
diff --cc sound/soc/codecs/hdac_hdmi.c
Simple merge
diff --cc sound/soc/fsl/fsl_asrc.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
		1	2	3	4	5
sound/soc/codecs/hdac_hdmi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/fsl/fsl_asrc.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history