Merge branches 'omap-fixes', 'omap-for-linus' and 'devel-pending' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 19:51:45 +0000 (12:51 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 19:51:45 +0000 (12:51 -0700)

Trivial merge