Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next

author Mark Brown <broonie@linaro.org>

Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)

committer Mark Brown <broonie@linaro.org>

Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
author Mark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
committer Mark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
committer	Mark Brown <broonie@linaro.org>
	Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
		1	2
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	blob \| history