Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Sat, 25 Sep 2010 00:15:06 +0000 (17:15 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 25 Sep 2010 00:15:06 +0000 (17:15 -0700)

Trivial merge