Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:14:04 +0000 (15:14 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:14:04 +0000 (15:14 -0700)

Trivial merge