Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Fri, 1 Sep 2017 11:13:06 +0000 (12:13 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 1 Sep 2017 11:13:06 +0000 (12:13 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:13:06 +0000 (12:13 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:13:06 +0000 (12:13 +0100)
diff --cc sound/soc/generic/audio-graph-card.c
Simple merge
diff --cc sound/soc/generic/audio-graph-scu-card.c
Simple merge
diff --cc sound/soc/generic/simple-card-utils.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 1 Sep 2017 11:13:06 +0000 (12:13 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 1 Sep 2017 11:13:06 +0000 (12:13 +0100)
		1	2	3	4	5	6
sound/soc/generic/audio-graph-card.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/generic/audio-graph-scu-card.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/generic/simple-card-utils.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history