Merge branch 'for-3.14/deps-from-dma-of' into for-3.14/dmas-resets-rework
authorStephen Warren <swarren@nvidia.com>
Wed, 11 Dec 2013 23:39:35 +0000 (16:39 -0700)
committerStephen Warren <swarren@nvidia.com>
Wed, 11 Dec 2013 23:39:35 +0000 (16:39 -0700)
commit076843e3e8a4fedb480cdad970f7cec25d32c0ab
tree2d877277c797d24f094811d99c0c2be9802bdf24
parent4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01
parent8010dad55a0ab0e829f3733854e5235eef4e2734
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
drivers/dma/dmaengine.c
include/linux/dmaengine.h