]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch for-3.14/deps-from-dma-of into for-next
authorStephen Warren <swarren@nvidia.com>
Thu, 12 Dec 2013 22:12:28 +0000 (15:12 -0700)
committerStephen Warren <swarren@nvidia.com>
Thu, 12 Dec 2013 22:12:28 +0000 (15:12 -0700)
1  2 
drivers/dma/dmaengine.c
include/linux/dmaengine.h

Simple merge
Simple merge