summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm
diff options
context:
space:
mode:
authorJoerg Roedel2015-11-02 12:03:34 +0100
committerJoerg Roedel2015-11-02 12:03:34 +0100
commitb67ad2f7c7514f94fe6bbd0cd86add445eb4e64a (patch)
treee203b2b499c76c2e35563cefd8b03146bf1cf73c /arch/s390/include/asm
parentLinux 4.3 (diff)
parentiommu/vt-d: Fix return value check of parse_ioapics_under_ir() (diff)
parentiommu/omap: Add support for configuring dsp iommus on DRA7xx (diff)
parentiommu/arm-smmu: Add support for MSI on SMMUv3 (diff)
parentiommu/s390: Add iommu api for s390 pci devices (diff)
parentiommu: Move default domain allocation to iommu_group_get_for_dev() (diff)
parentiommu/amd: Remove find_last_devid_on_pci() (diff)
downloadkernel-qcow2-linux-b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a.tar.gz
kernel-qcow2-linux-b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a.tar.xz
kernel-qcow2-linux-b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a.zip
Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next
Conflicts: drivers/iommu/amd_iommu_types.h