Merge branch 'topic/omap' into for-linus

diff --cc drivers/dma/Kconfig
Simple merge

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

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

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