Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 01:32:27 +0000 (18:32 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 01:32:27 +0000 (18:32 -0700)

Trivial merge