]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:09:31 +0000 (10:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:09:31 +0000 (10:09 +1000)

Trivial merge