Merge remote-tracking branches 'asoc/fix/dpcm', 'asoc/fix/imx', 'asoc/fix/msm8916...

author Mark Brown <broonie@kernel.org>

Tue, 1 Aug 2017 14:17:06 +0000 (15:17 +0100)

committer Mark Brown <broonie@kernel.org>

Tue, 1 Aug 2017 14:17:06 +0000 (15:17 +0100)
author Mark Brown <broonie@kernel.org>
Tue, 1 Aug 2017 14:17:06 +0000 (15:17 +0100)
committer Mark Brown <broonie@kernel.org>
Tue, 1 Aug 2017 14:17:06 +0000 (15:17 +0100)
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-pcm.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Tue, 1 Aug 2017 14:17:06 +0000 (15:17 +0100)
committer	Mark Brown <broonie@kernel.org>
	Tue, 1 Aug 2017 14:17:06 +0000 (15:17 +0100)
		1	2	3	4	5	6	7
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/soc-pcm.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history