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

author Mark Brown <broonie@kernel.org>

Sun, 30 Aug 2015 14:53:22 +0000 (15:53 +0100)

committer Mark Brown <broonie@kernel.org>

Sun, 30 Aug 2015 14:53:22 +0000 (15:53 +0100)
author Mark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:53:22 +0000 (15:53 +0100)
committer Mark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:53:22 +0000 (15:53 +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/cs42l73.c
Simple merge
diff --cc sound/soc/codecs/da732x.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 30 Aug 2015 14:53:22 +0000 (15:53 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 30 Aug 2015 14:53:22 +0000 (15:53 +0100)
		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
sound/soc/codecs/cs42l56.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/cs42l73.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/da732x.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history