From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Nov 2011 16:56:56 +0000 (-0200)
Subject: Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Tag: v3.12-rc1~4433
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=101041cf2619b397b0fa7e2ab544607026d59314;p=kernel%2Fkernel-generic.git

Merge branch 'iommu/fixes' of git://git./linux/kernel/git/joro/iommu

* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu: omap: Fix compile failure
---

101041cf2619b397b0fa7e2ab544607026d59314