diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 19:44:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 19:44:22 +0100 |
| commit | cc669743a39e3f61c9ca5e786e959bf478ccd197 (patch) | |
| tree | 99b1e239b6dea761435a5199c994371f01f500bf /scripts | |
| parent | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU (diff) | |
| download | linux-cc669743a39e3f61c9ca5e786e959bf478ccd197.tar.xz linux-cc669743a39e3f61c9ca5e786e959bf478ccd197.zip | |
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions