]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5d699774c65f7689c12ca9a3c71a7f0d66b10cf3
tree001d90ae19ec62d7f34df127a36783ef78e5bc75
parentd48e568777a65d666741b86c3f19edc7073b7fef
parent6ca0fe278d335a047f86b0e07e1f877e6cad2776
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
arch/arm/mach-omap2/devices.c