Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Tue, 12 Oct 2010 23:12:00 +0000 (16:12 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 12 Oct 2010 23:12:00 +0000 (16:12 -0700)

Trivial merge