Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 3 Apr 2009 23:52:01 +0000 (16:52 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 3 Apr 2009 23:52:01 +0000 (16:52 -0700)

Trivial merge