Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc/topic...

author Mark Brown <broonie@linaro.org>

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

committer Mark Brown <broonie@linaro.org>

Wed, 21 May 2014 23:24:04 +0000 (00:24 +0100)
author Mark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:24:04 +0000 (00:24 +0100)
committer Mark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:24:04 +0000 (00:24 +0100)
diff --cc sound/soc/codecs/wm8731.c
Simple merge
diff --cc sound/soc/codecs/wm8804.c
Simple merge
diff --cc sound/soc/codecs/wm8955.c
Simple merge
diff --cc sound/soc/codecs/wm8985.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 21 May 2014 23:24:04 +0000 (00:24 +0100)
committer	Mark Brown <broonie@linaro.org>
	Wed, 21 May 2014 23:24:04 +0000 (00:24 +0100)
		1	2	3	4	5	6
sound/soc/codecs/wm8731.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8804.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8955.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/wm8985.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history