Merge remote-tracking branch 'dmaengine/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)
diff --cc drivers/dma/Kconfig
Simple merge
diff --cc drivers/dma/dmaengine.c
Simple merge
diff --cc drivers/dma/pl330.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 20 Dec 2013 00:59:53 +0000 (11:59 +1100)
		1	2
drivers/dma/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/dmaengine.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	patch \|	diff1 \|	diff2 \|	blob \| history