Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Wed, 16 Jun 2010 16:10:43 +0000 (19:10 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 16 Jun 2010 16:10:43 +0000 (19:10 +0300)

Trivial merge