Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Sat, 17 Oct 2009 00:11:07 +0000 (17:11 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 17 Oct 2009 00:11:07 +0000 (17:11 -0700)
Merge branch 'omap-fixes' into tmp-rebuild-1255738174


Trivial merge