Merge branch 'omap-fixes-testing'
authorTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 21:38:26 +0000 (14:38 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 21:38:26 +0000 (14:38 -0700)

Trivial merge