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)
This merges git://git.infradead.org/users/vkoul/slave-dma.git topic/of

1  2 
drivers/dma/dmaengine.c
include/linux/dmaengine.h

Simple merge
Simple merge