-
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommuLinus Torvalds authored
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: ARM: OMAP3: fix build on !CONFIG_IOMMU_API
6e03db2b
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: ARM: OMAP3: fix build on !CONFIG_IOMMU_API