summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx18/cx18-alsa.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-17 10:44:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-17 10:44:22 -0800
commitcc669743a39e3f61c9ca5e786e959bf478ccd197 (patch)
tree99b1e239b6dea761435a5199c994371f01f500bf /drivers/media/pci/cx18/cx18-alsa.h
parent9f3e15129902bca9d8e296c165345f158bac94eb (diff)
parent5e9f36c59a4883c6d8db4a3c097e4fc2234742de (diff)
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 'drivers/media/pci/cx18/cx18-alsa.h')
0 files changed, 0 insertions, 0 deletions