Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Fri, 17 Sep 2010 00:03:39 +0000 (17:03 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Sep 2010 00:03:39 +0000 (17:03 -0700)

Trivial merge