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

author Mark Brown <broonie@linaro.org>

Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)

committer Mark Brown <broonie@linaro.org>

Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
author Mark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
committer Mark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
diff --cc include/sound/soc-dapm.h
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 17 Jun 2013 16:20:17 +0000 (17:20 +0100)
		1	2
include/sound/soc-dapm.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	blob \| history