Commits
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: ARM: OMAP3: fix build on !CONFIG_IOMMU_API
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: ARM: OMAP3: fix build on !CONFIG_IOMMU_API