Merge branches 'omap-for-linus' and 'devel-dma' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:22:47 +0000 (19:22 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 21 Dec 2010 03:22:47 +0000 (19:22 -0800)

Trivial merge