Merge tag 'vfio-v3.16-rc1' of git://github.com/awilliam/linux-vfio into next
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jun 2014 03:12:15 +0000 (20:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jun 2014 03:12:15 +0000 (20:12 -0700)
commita68a7509d3af8ee458d32b2416b0c2aaf2a4a7e3
treea0e6a40ff4c384364d9eca02d490eab7dca21eee
parent639b4ac691c6f6e48921dc576379c176f82f3250
parentfd49c81f080a997aad4b0e73541cd42772b6a772
Merge tag 'vfio-v3.16-rc1' of git://github.com/awilliam/linux-vfio into next

Pull VFIO updates from Alex Williamson:
 "A handful of VFIO bug fixes for v3.16"

* tag 'vfio-v3.16-rc1' of git://github.com/awilliam/linux-vfio:
  drivers/vfio/pci: Fix wrong MSI interrupt count
  drivers/vfio: Rework offsetofend()
  vfio/iommu_type1: Avoid overflow
  vfio/pci: Fix unchecked return value
  vfio/pci: Fix sizing of DPA and THP express capabilities