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

Trivial merge