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

author Mark Brown <broonie@linaro.org>

Wed, 21 May 2014 23:23:45 +0000 (00:23 +0100)

committer Mark Brown <broonie@linaro.org>

Wed, 21 May 2014 23:23:45 +0000 (00:23 +0100)
author Mark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:45 +0000 (00:23 +0100)
committer Mark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:45 +0000 (00:23 +0100)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/alc5623.c
Simple merge
diff --cc sound/soc/codecs/wm5110.c
Simple merge
diff --cc sound/soc/codecs/wm_adsp.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 21 May 2014 23:23:45 +0000 (00:23 +0100)
committer	Mark Brown <broonie@linaro.org>
	Wed, 21 May 2014 23:23:45 +0000 (00:23 +0100)
		1	2	3	4	5	6	7	8	9
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
sound/soc/codecs/alc5623.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
sound/soc/codecs/wm5110.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
sound/soc/codecs/wm_adsp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history