From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Dec 2014 18:44:22 +0000 (-0800)
Subject: Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v3.19-rc1~44
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cc669743a39e3f61c9ca5e786e959bf478ccd197;p=linux-2.6-block.git

Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:
 - s390 support (Frank Blaschka)
 - Enable iommu-type1 for ARM SMMU (Will Deacon)

* tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio:
  drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU
  vfio: make vfio run on s390
---

cc669743a39e3f61c9ca5e786e959bf478ccd197