Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Sun, 16 Aug 2009 15:48:19 +0000 (18:48 +0300)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Aug 2009 15:48:19 +0000 (18:48 +0300)

Trivial merge