Merge remote-tracking branches 'asoc/topic/ak5386', 'asoc/topic/ak5558', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Wed, 28 Mar 2018 02:28:55 +0000 (10:28 +0800)

committer Mark Brown <broonie@kernel.org>

Wed, 28 Mar 2018 02:28:55 +0000 (10:28 +0800)
author Mark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:28:55 +0000 (10:28 +0800)
committer Mark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:28:55 +0000 (10:28 +0800)
diff --cc sound/soc/amd/acp-pcm-dma.c
Simple merge
diff --cc sound/soc/amd/acp.h
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 28 Mar 2018 02:28:55 +0000 (10:28 +0800)
committer	Mark Brown <broonie@kernel.org>
	Wed, 28 Mar 2018 02:28:55 +0000 (10:28 +0800)
		1	2	3	4	5	6
sound/soc/amd/acp-pcm-dma.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/amd/acp.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history