Merge remote-tracking branch 'slave-dma/next'

author Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)

committer Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)
author Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)
committer Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)
diff --cc drivers/dma/amba-pl08x.c
Simple merge
diff --cc drivers/dma/pl330.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 11:54:51 +0000 (12:54 +0100)
		1	2
drivers/dma/amba-pl08x.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	patch \|	diff1 \|	diff2 \|	blob \| history