Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Mon, 28 Jun 2010 12:47:04 +0000 (15:47 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 28 Jun 2010 12:47:04 +0000 (15:47 +0300)

Trivial merge