Merge branch 'asoc-4.17' into asoc-4.18 merge window

author Mark Brown <broonie@kernel.org>

Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)

committer Mark Brown <broonie@kernel.org>

Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
author Mark Brown <broonie@kernel.org>
Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
committer Mark Brown <broonie@kernel.org>
Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/intel/boards/bytcr_rt5651.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
committer	Mark Brown <broonie@kernel.org>
	Tue, 5 Jun 2018 14:25:41 +0000 (15:25 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/boards/bytcr_rt5651.c	patch \|	diff1 \|	diff2 \|	blob \| history