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


Trivial merge