Merge branch 'omap-fixes' into omap-fixes-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 21:10:24 +0000 (13:10 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 21:10:24 +0000 (13:10 -0800)

Trivial merge