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

author Mark Brown <broonie@linaro.org>

Tue, 7 Jan 2014 17:58:10 +0000 (17:58 +0000)

committer Mark Brown <broonie@linaro.org>

Tue, 7 Jan 2014 17:58:10 +0000 (17:58 +0000)
author Mark Brown <broonie@linaro.org>
Tue, 7 Jan 2014 17:58:10 +0000 (17:58 +0000)
committer Mark Brown <broonie@linaro.org>
Tue, 7 Jan 2014 17:58:10 +0000 (17:58 +0000)
diff --cc drivers/dma/dmaengine.c
Simple merge
diff --cc sound/soc/soc-devres.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Tue, 7 Jan 2014 17:58:10 +0000 (17:58 +0000)
committer	Mark Brown <broonie@linaro.org>
	Tue, 7 Jan 2014 17:58:10 +0000 (17:58 +0000)
		1	2
drivers/dma/dmaengine.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-devres.c	patch \|	diff1 \|	diff2 \|	blob \| history