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)
commit1abbce4e83fa60a6c6d62ae05a125602ea8e5bc7
treec0112050f91c22b53260f1c4dca0ffe1265945d6
parent0c59f236139877f08b0c7a6e1411584f4ba07160
parentb68e7fa879cd3b1126a7c455d9da1b70299efc0d
Merge tag 'vfio-for-linus' of git://github.com/awilliam/linux-vfio

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