Merge remote-tracking branches 'asoc/topic/cs43130', 'asoc/topic/cs53l30', 'asoc...

author Mark Brown <broonie@kernel.org>

Fri, 1 Sep 2017 11:12:32 +0000 (12:12 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 1 Sep 2017 11:12:32 +0000 (12:12 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:32 +0000 (12:12 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:32 +0000 (12:12 +0100)
diff --cc sound/soc/bcm/cygnus-ssp.c
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/cs53l30.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 1 Sep 2017 11:12:32 +0000 (12:12 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 1 Sep 2017 11:12:32 +0000 (12:12 +0100)
		1	2	3	4	5
sound/soc/bcm/cygnus-ssp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/cs53l30.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history