Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap',...
authorJoerg Roedel <jroedel@suse.de>
Wed, 8 Aug 2018 10:02:27 +0000 (12:02 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 8 Aug 2018 10:02:27 +0000 (12:02 +0200)
commit6488a7f35eeab463f6c9c2ea34d30ca856f0bc8e
treeb63a179d3edeac66d84d403c6631303681bd7b51
parent7efe25a70c37395b41b034335345d6855926c2a6
parent5c5c87411488af3cd082221e567498d813d0fe83
parent379521462e4add27f3514da8e4ab1fd7a54fe1c7
parentd81dc82e0f19a3155935e10b752967335e6cbbef
parent04c532a1cdc7e423656c07937aa4b5c1c2b064f9
parentf1a066fcc9725960a73c00267afe7e346cc9fc6f
parentd9737953d85131436b09668b5e8d3389c37c1f28
parentd88e61faad526a5850e9330c846641b91cf971e7
Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap', 'x86/amd', 'x86/vt-d' and 'core' into next
13 files changed:
Documentation/admin-guide/kernel-parameters.txt
drivers/iommu/Kconfig
drivers/iommu/Makefile
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_init.c
drivers/iommu/amd_iommu_types.h
drivers/iommu/arm-smmu-v3.c
drivers/iommu/arm-smmu.c
drivers/iommu/intel-iommu.c
drivers/iommu/ipmmu-vmsa.c
drivers/iommu/msm_iommu.c
drivers/iommu/omap-iommu.c
include/linux/intel-iommu.h