Merge branch 'omap-fixes-testing'
authorTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 00:58:47 +0000 (17:58 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 00:58:47 +0000 (17:58 -0700)

Trivial merge