Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:56:56 +0000 (14:56 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:56:56 +0000 (14:56 -0200)
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu: omap: Fix compile failure


Trivial merge