Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Mon, 28 Sep 2009 18:36:28 +0000 (11:36 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 28 Sep 2009 18:36:28 +0000 (11:36 -0700)

Trivial merge