From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Aug 2012 18:47:42 +0000 (-0700)
Subject: Merge tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v3.6-rc2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63ca5f1d17a4eecaec3149982223fe89e55a568f;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

63ca5f1d17a4eecaec3149982223fe89e55a568f