]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:33:34 +0000 (15:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 04:33:34 +0000 (15:33 +1100)

Trivial merge