Merge remote-tracking branches 'asoc/topic/msm8916', 'asoc/topic/mtk', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Mon, 3 Jul 2017 15:15:12 +0000 (16:15 +0100)

committer Mark Brown <broonie@kernel.org>

Mon, 3 Jul 2017 15:15:12 +0000 (16:15 +0100)
author Mark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:12 +0000 (16:15 +0100)
committer Mark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:12 +0000 (16:15 +0100)
diff --cc sound/soc/generic/simple-card.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 3 Jul 2017 15:15:12 +0000 (16:15 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 3 Jul 2017 15:15:12 +0000 (16:15 +0100)