]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
projects / linux-imx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eac9eb 817fea2)
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)
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


Trivial merge
Local Linux development repo for Freescale iMX