]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'vfio/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:28:48 +0000 (14:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:28:48 +0000 (14:28 +1100)

Trivial merge