Merge tag 'vfio-v4.2-rc5' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2015 17:17:55 +0000 (10:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jul 2015 17:17:55 +0000 (10:17 -0700)
Pull VFIO fix from Alex Williamson:
 "Fix a lockdep reported deadlock in device open error path"

* tag 'vfio-v4.2-rc5' of git://github.com/awilliam/linux-vfio:
  vfio: Fix lockdep issue


Trivial merge