From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jan 2012 01:47:27 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
X-Git-Tag: v3.3-rc1~38
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/6e03db2ba17b5d32431b4c2012e6a41153318a90

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
---

6e03db2ba17b5d32431b4c2012e6a41153318a90