Merge remote-tracking branch 'asoc/topic/core' into for-tiwai

author Mark Brown <broonie@linaro.org>

Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)

committer Mark Brown <broonie@linaro.org>

Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
author Mark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
committer Mark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-pcm.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
committer	Mark Brown <broonie@linaro.org>
	Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
		1	2
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-pcm.c	patch \|	diff1 \|	diff2 \|	blob \| history