Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Jan 2012 01:47:27 +0000 (17:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Jan 2012 01:47:27 +0000 (17:47 -0800)
commit6e03db2ba17b5d32431b4c2012e6a41153318a90
tree001d90ae19ec62d7f34df127a36783ef78e5bc75
parente032d80774315869aa2285b217fdbbfed86c0b49
parent1a51a0ce174ddc0b0c11b6a0dbd179d95020e80b
Merge branch 'next' of git://git./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
arch/arm/mach-omap2/devices.c