Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5670', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:53:18 +0000 (15:53 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:53:18 +0000 (15:53 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:18 +0000 (15:53 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:18 +0000 (15:53 +0000)
diff --cc sound/soc/generic/simple-scu-card.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:53:18 +0000 (15:53 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:53:18 +0000 (15:53 +0000)