Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jul 2013 21:50:08 +0000 (14:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jul 2013 21:50:08 +0000 (14:50 -0700)
commit15a49b9a90c86c6cb7f270a699d2ae7468862c28
tree218fc6bf3ae5beb989cddaede2e4ee0c2e679845
parent8d10aae2741ec9ffd53c8d214f7ada6d543b3a46
parent8d38ef1948bd415a5cb653a5c0ec16f3402aaca1
Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio

Pull vfio updates from Alex Williamson:
 "Largely hugepage support for vfio/type1 iommu and surrounding cleanups
  and fixes"

* tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Fix leak on error path
  vfio: Limit group opens
  vfio/type1: Fix missed frees and zero sized removes
  vfio: fix documentation
  vfio: Provide module option to disable vfio_iommu_type1 hugepage support
  vfio: hugepage support for vfio_iommu_type1
  vfio: Convert type1 iommu to use rbtree
Documentation/vfio.txt
drivers/vfio/vfio.c
include/uapi/linux/vfio.h