Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 20:23:54 +0000 (13:23 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 20:23:54 +0000 (13:23 -0700)

Trivial merge