]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 01:44:13 +0000 (11:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 01:44:13 +0000 (11:44 +1000)
1  2 
arch/arm/common/edma.c

Simple merge