Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Tue, 15 Dec 2009 21:51:32 +0000 (13:51 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Dec 2009 21:51:32 +0000 (13:51 -0800)
Merge branch 'omap-testing' into tmp-rebuild-1260913890


Trivial merge