Merge branches 'omap-fixes', 'omap-for-linus' and 'devel-pending' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 22 Oct 2010 18:15:34 +0000 (11:15 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Oct 2010 18:15:34 +0000 (11:15 -0700)

Trivial merge