Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 25 Feb 2010 04:53:03 +0000 (20:53 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Feb 2010 04:53:03 +0000 (20:53 -0800)

Trivial merge