]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'swiotlb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Aug 2011 01:55:32 +0000 (11:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 29 Aug 2011 01:55:32 +0000 (11:55 +1000)

Trivial merge