Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu...
authorJoerg Roedel <jroedel@suse.de>
Thu, 4 May 2017 16:06:17 +0000 (18:06 +0200)
committerJoerg Roedel <jroedel@suse.de>
Thu, 4 May 2017 16:06:17 +0000 (18:06 +0200)
commit2c0248d68880fc0e783af1048b3367ee5d4412f0
treeab377d1dac914a047329ceff87e7dbe53d212217
parentd5bf739dc7628a35b334cdb9058750388927760a
parentfd8e2d4b393252505783656471465c7f85f3c0a9
parentc9d9f2394c6a953585874a1a6cb2ecea853fdcf2
parent6f66ea099fc2f31d31d6cd39f3b13b23bdeb6196
parentbdf95923086fb359ccb44c815724c3ace1611c90
parent26b37b946a5c2658dbc37dd5d6df40aaa9685d70
parent8e12188400668046870087fc278404a11c853061
parent73dbd4a4230216b6a5540a362edceae0c9b4876b
parent290d638e04e7b94ff34d2f5e9426e7ce617e9a59
Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next
16 files changed:
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/arm/mm/dma-mapping.c
arch/arm64/mm/dma-mapping.c
drivers/acpi/glue.c
drivers/acpi/scan.c
drivers/iommu/arm-smmu-v3.c
drivers/iommu/arm-smmu.c
drivers/iommu/exynos-iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/iommu.c
drivers/iommu/iova.c
drivers/iommu/rockchip-iommu.c
include/asm-generic/vmlinux.lds.h
include/linux/dma-iommu.h
include/linux/iommu.h