Merge branch '2_6_32rc4_fixes' of git://git.pwsan.com/linux-2.6 into omap-fixes-for...
authorTony Lindgren <tony@atomide.com>
Wed, 14 Oct 2009 22:46:15 +0000 (15:46 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 14 Oct 2009 22:46:15 +0000 (15:46 -0700)

Trivial merge