]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:27:38 +0000 (11:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:27:38 +0000 (11:27 +1000)
1  2 
include/linux/dmaengine.h

Simple merge