Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:13:40 +0000 (19:13 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:13:40 +0000 (19:13 -0800)

Trivial merge