Merge remote-tracking branch 'vfio/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:09:50 +0000 (13:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:09:50 +0000 (13:09 +1100)

Trivial merge