]> 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)
commit58922ce55ea2b1fab56ca1047016bfb08b8e12ec
tree001d90ae19ec62d7f34df127a36783ef78e5bc75
parent6a0633420578a7aba8005031601bfb5d89f5d68c
parent290ce0e33f8f3a0ba4437344cc9890b0d5e15f63
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