Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 19:55:29 +0000 (12:55 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 19:55:29 +0000 (12:55 -0700)

Trivial merge