Merge omap-fixes
authorTony Lindgren <tony@atomide.com>
Tue, 29 Dec 2009 00:56:57 +0000 (16:56 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 29 Dec 2009 00:56:57 +0000 (16:56 -0800)
Merge branch 'omap-fixes' into tmp-rebuild-1262048216


Trivial merge