Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 01:51:23 +0000 (18:51 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Oct 2010 01:51:23 +0000 (18:51 -0700)

Trivial merge