Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Wed, 22 Sep 2010 17:32:29 +0000 (10:32 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Sep 2010 17:32:29 +0000 (10:32 -0700)

Trivial merge