Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/mtk', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Mon, 12 Sep 2016 19:09:20 +0000 (20:09 +0100)

committer Mark Brown <broonie@kernel.org>

Mon, 12 Sep 2016 19:09:20 +0000 (20:09 +0100)
author Mark Brown <broonie@kernel.org>
Mon, 12 Sep 2016 19:09:20 +0000 (20:09 +0100)
committer Mark Brown <broonie@kernel.org>
Mon, 12 Sep 2016 19:09:20 +0000 (20:09 +0100)
diff --cc sound/soc/codecs/ab8500-codec.c
Simple merge
diff --cc sound/soc/codecs/max98371.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 12 Sep 2016 19:09:20 +0000 (20:09 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 12 Sep 2016 19:09:20 +0000 (20:09 +0100)
		1	2	3	4	5
sound/soc/codecs/ab8500-codec.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/max98371.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history