Merge remote-tracking branches 'asoc/topic/ssm2518', 'asoc/topic/sta529', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)

committer Mark Brown <broonie@kernel.org>

Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)
author Mark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)
committer Mark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)
diff --cc sound/soc/Kconfig
Simple merge
diff --cc sound/soc/Makefile
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/sta529.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 30 Aug 2015 14:57:13 +0000 (15:57 +0100)
		1	2	3	4	5
sound/soc/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/Makefile	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/sta529.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history