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

author Mark Brown <broonie@linaro.org>

Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 30 Aug 2013 10:04:14 +0000 (11:04 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history