Merge tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2012 18:47:42 +0000 (11:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2012 18:47:42 +0000 (11:47 -0700)
commit63ca5f1d17a4eecaec3149982223fe89e55a568f
treef8ebd2cf85e5a9850bb628f8b42104772b16ff4e
parent2eac9eb8a2e64cbfcc300e9a8098edf424c1d16c
parent817fea2df3c24b22f6123dc0106eb063b7132883
Merge tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "Just a trivial patch to include vfio.h in the installed headers so we
  can complete userspace integration into QEMU."

* tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio:
  vfio: Include vfio.h in installed headers