Merge branch 'for-3.14/deps-from-dma-of' into for-3.14/dmas-resets-rework

This merges git://git.infradead.org/users/vkoul/slave-dma.git topic/of

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

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