Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Wed, 29 Sep 2010 18:18:56 +0000 (11:18 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Sep 2010 18:18:56 +0000 (11:18 -0700)

Trivial merge