tree e214e297b3e52c0156fbca5a97056ee2a1829e8f
parent 5870b2c719b15cfe3f2de3e8be51bc6e17c67e7a
parent 08f2e6312c67fed80df9342e06ad36daf11eb80b
author Linus Torvalds <torvalds@linux-foundation.org> 1321376216 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321376216 -0200

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

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