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)
commitd9065f44be579a1dcf572be717ba8b1ce342ebd6
treefceb600644072a5efcef60aca4eda72827ec5d66
parent733db573a6451681b60e7372d2862de09d6eb04e
parent4bc94d5dc95d3a2159d821b39277477e69507f67
Merge tag 'vfio-v4.2-rc5' of git://github.com/awilliam/linux-vfio

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