Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/adsp', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Wed, 23 Dec 2015 00:23:35 +0000 (00:23 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 23 Dec 2015 00:23:35 +0000 (00:23 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:35 +0000 (00:23 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:35 +0000 (00:23 +0000)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 23 Dec 2015 00:23:35 +0000 (00:23 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 23 Dec 2015 00:23:35 +0000 (00:23 +0000)
		1	2	3	4	5
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history