Merge branch 'omap-fixes' into omap-fixes-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:21:01 +0000 (18:21 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:21:01 +0000 (18:21 -0800)

Trivial merge