Merge branches 'omap-fixes', 'omap-for-linus' and 'devel-pending' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 00:16:27 +0000 (17:16 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 00:16:27 +0000 (17:16 -0700)

Trivial merge