Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/topology'...

author Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
diff --cc include/sound/soc-dai.h
Simple merge
diff --cc include/sound/soc.h
Simple merge
diff --cc include/uapi/sound/asoc.h
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
		1	2	3	4	5	6
include/sound/soc-dai.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/uapi/sound/asoc.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/soc-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history