Merge branch 'asoc-4.17' into asoc-4.18 for compress dependencies

author Mark Brown <[email protected]>

Thu, 26 Apr 2018 11:24:28 +0000 (12:24 +0100)

committer Mark Brown <[email protected]>

Thu, 26 Apr 2018 11:24:28 +0000 (12:24 +0100)
author Mark Brown <[email protected]>
Thu, 26 Apr 2018 11:24:28 +0000 (12:24 +0100)
committer Mark Brown <[email protected]>
Thu, 26 Apr 2018 11:24:28 +0000 (12:24 +0100)
diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/soc-topology.c
Simple merge
author	Mark Brown <[email protected]>
	Thu, 26 Apr 2018 11:24:28 +0000 (12:24 +0100)
committer	Mark Brown <[email protected]>
	Thu, 26 Apr 2018 11:24:28 +0000 (12:24 +0100)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-topology.c	patch \|	diff1 \|	diff2 \|	blob \| history