Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu...
Ingo Molnar [Thu, 7 Jul 2011 10:56:44 +0000 (12:56 +0200)]

Trivial merge