Merge branch 'v2.6.34-rc7.iommu' of git://gitorious.org/~doyu/lk/mainline into tmp
authorTony Lindgren <tony@atomide.com>
Fri, 14 May 2010 18:26:48 +0000 (11:26 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 14 May 2010 18:26:48 +0000 (11:26 -0700)

Trivial merge