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

Trivial merge