]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Mar 2016 23:59:04 +0000 (10:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Mar 2016 23:59:04 +0000 (10:59 +1100)
1  2 
drivers/dma/idma64.h

Simple merge