From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jun 2014 03:12:15 +0000 (-0700)
Subject: Merge tag 'vfio-v3.16-rc1' of git://github.com/awilliam/linux-vfio into next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~91^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68a7509d3af8ee458d32b2416b0c2aaf2a4a7e3;p=pandora-kernel.git

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

a68a7509d3af8ee458d32b2416b0c2aaf2a4a7e3
Reading git-diff-tree failed