Merge branch 'for_2.6.34_4f4e65_a' of git://git.pwsan.com/linux-2.6 into omap-for...
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2010 03:16:40 +0000 (19:16 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2010 03:16:40 +0000 (19:16 -0800)

Trivial merge