diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-11-02 12:03:34 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-11-02 12:03:34 +0100 |
| commit | b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a (patch) | |
| tree | e203b2b499c76c2e35563cefd8b03146bf1cf73c /drivers/iommu/Makefile | |
| parent | Linux 4.3 (diff) | |
| parent | iommu/vt-d: Fix return value check of parse_ioapics_under_ir() (diff) | |
| parent | iommu/omap: Add support for configuring dsp iommus on DRA7xx (diff) | |
| parent | iommu/arm-smmu: Add support for MSI on SMMUv3 (diff) | |
| parent | iommu/s390: Add iommu api for s390 pci devices (diff) | |
| parent | iommu: Move default domain allocation to iommu_group_get_for_dev() (diff) | |
| parent | iommu/amd: Remove find_last_devid_on_pci() (diff) | |
| download | linux-b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a.tar.xz 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