From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jul 2013 21:50:08 +0000 (-0700)
Subject: Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v3.11-rc1~46
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=15a49b9a90c86c6cb7f270a699d2ae7468862c28;p=linux-2.6-block.git

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

15a49b9a90c86c6cb7f270a699d2ae7468862c28