]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'dmaengine/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:56:05 +0000 (10:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:56:05 +0000 (10:56 +1000)
1  2 
drivers/dma/dmaengine.c
include/linux/dmaengine.h

Simple merge
Simple merge