Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2014 18:44:22 +0000 (10:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2014 18:44:22 +0000 (10:44 -0800)
commitcc669743a39e3f61c9ca5e786e959bf478ccd197
tree99b1e239b6dea761435a5199c994371f01f500bf
parent9f3e15129902bca9d8e296c165345f158bac94eb
parent5e9f36c59a4883c6d8db4a3c097e4fc2234742de
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