Merge branch 'topic/univ_api' into for-linus

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

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

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