]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'v2.6.34-rc7.iommu' of git://gitorious.org/~doyu/lk/mainline into omap...
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:14:28 +0000 (11:14 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:14:28 +0000 (11:14 -0700)

Trivial merge