Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next

Conflicts:
	drivers/iommu/Makefile
	drivers/iommu/tegra-gart.c