Merge branch 'omap-fixes-2.6.33-rc1' into omap-fixes
authorTony Lindgren <tony@atomide.com>
Tue, 5 Jan 2010 19:07:22 +0000 (11:07 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Jan 2010 19:07:22 +0000 (11:07 -0800)

Trivial merge