Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l56', 'asoc/topic...

author Mark Brown <broonie@linaro.org>

Mon, 4 Aug 2014 15:31:33 +0000 (16:31 +0100)

committer Mark Brown <broonie@linaro.org>

Mon, 4 Aug 2014 15:31:33 +0000 (16:31 +0100)
author Mark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:33 +0000 (16:31 +0100)
committer Mark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:33 +0000 (16:31 +0100)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/cs42l56.c
Simple merge
diff --cc sound/soc/codecs/cx20442.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:33 +0000 (16:31 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:33 +0000 (16:31 +0100)
		1	2	3	4	5	6
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/cs42l56.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/cx20442.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history