Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 3 Sep 2009 17:17:39 +0000 (10:17 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Sep 2009 17:17:39 +0000 (10:17 -0700)

Trivial merge