Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Mon, 12 Oct 2009 16:21:57 +0000 (09:21 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 12 Oct 2009 16:21:57 +0000 (09:21 -0700)
Merge branch 'omap-fixes' into tmp-rebuild-1255364515


Trivial merge