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

author Mark Brown <broonie@linaro.org>

Mon, 4 Aug 2014 15:31:17 +0000 (16:31 +0100)

committer Mark Brown <broonie@linaro.org>

Mon, 4 Aug 2014 15:31:17 +0000 (16:31 +0100)
author Mark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:17 +0000 (16:31 +0100)
committer Mark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:17 +0000 (16:31 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:17 +0000 (16:31 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:17 +0000 (16:31 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history