Merge tag 'vfio-for-linus' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Sep 2012 23:16:33 +0000 (16:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Sep 2012 23:16:33 +0000 (16:16 -0700)
Pull vfio fixes from Alex Williamson:
 "VFIO doc update and virqfd race fix"

* tag 'vfio-for-linus' of git://github.com/awilliam/linux-vfio:
  vfio: Fix virqfd release race
  vfio: Trivial Documentation correction


Trivial merge