Merge branches 'omap-fixes', 'omap-for-linus' and 'devel-pending' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 20:22:09 +0000 (13:22 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 20:22:09 +0000 (13:22 -0700)

Trivial merge