Merge branches 'omap-fixes' and 'omap-for-linus' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 12 Oct 2010 23:08:49 +0000 (16:08 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 12 Oct 2010 23:08:49 +0000 (16:08 -0700)

Trivial merge