Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Wed, 21 Apr 2010 22:26:56 +0000 (15:26 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 21 Apr 2010 22:26:56 +0000 (15:26 -0700)

Trivial merge