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

author Mark Brown <broonie@linaro.org>

Tue, 20 Aug 2013 10:24:27 +0000 (11:24 +0100)

committer Mark Brown <broonie@linaro.org>

Tue, 20 Aug 2013 10:24:27 +0000 (11:24 +0100)
author Mark Brown <broonie@linaro.org>
Tue, 20 Aug 2013 10:24:27 +0000 (11:24 +0100)
committer Mark Brown <broonie@linaro.org>
Tue, 20 Aug 2013 10:24:27 +0000 (11:24 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Tue, 20 Aug 2013 10:24:27 +0000 (11:24 +0100)
committer	Mark Brown <broonie@linaro.org>
	Tue, 20 Aug 2013 10:24:27 +0000 (11:24 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	blob \| history