Merge branch 'iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorTony Lindgren <tony@atomide.com>
Wed, 10 Jun 2009 10:23:43 +0000 (13:23 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Jun 2009 10:23:43 +0000 (13:23 +0300)

Trivial merge