Merge branch 'omap-fixes'
authorTony Lindgren <tony@atomide.com>
Tue, 22 Sep 2009 01:33:46 +0000 (18:33 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 22 Sep 2009 01:33:46 +0000 (18:33 -0700)

Trivial merge