Merge branch 'topic/of' into next

Conflicts:
	drivers/dma/mmp_pdma.c

diff --cc drivers/dma/dmaengine.c
Simple merge

diff --cc drivers/dma/mmp_pdma.c
Simple merge

diff --cc include/linux/dmaengine.h
Simple merge