Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Wed, 8 Apr 2009 00:05:31 +0000 (17:05 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 8 Apr 2009 00:05:31 +0000 (17:05 -0700)

Trivial merge