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

author Mark Brown <broonie@linaro.org>

Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)

committer Mark Brown <broonie@linaro.org>

Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
author Mark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
committer Mark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
diff --cc MAINTAINERS
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, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
committer	Mark Brown <broonie@linaro.org>
	Tue, 27 Aug 2013 14:40:03 +0000 (15:40 +0100)
		1	2
MAINTAINERS	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