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

Trivial merge