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

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/iommu.c
Simple merge

diff --cc drivers/iommu/omap-iommu.c
Simple merge

diff --cc drivers/iommu/omap-iovmm.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispccdc.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispstat.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispvideo.c
Simple merge

diff --cc drivers/pci/ats.c
Simple merge