Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 2 Oct 2009 22:49:46 +0000 (15:49 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 2 Oct 2009 22:49:46 +0000 (15:49 -0700)

Trivial merge