]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 02:31:51 +0000 (12:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 02:31:51 +0000 (12:31 +1000)
1  2 
MAINTAINERS
drivers/dma/sh/shdma.c

diff --cc MAINTAINERS
Simple merge
Simple merge