Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:35:19 +0000 (11:35 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:35:19 +0000 (11:35 -0700)

Trivial merge