Merge branch 'iommu/2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...
authorIngo Molnar <mingo@elte.hu>
Tue, 10 May 2011 20:15:57 +0000 (22:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 May 2011 20:15:57 +0000 (22:15 +0200)

Trivial merge