linux-imx

Merge branch 'next/devel-samsung-iommu' into next/devel-samsung

Conflicts:
	arch/arm/mach-exynos/Makefile