Merge commit 'v2.6.32-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 6 Nov 2009 07:00:48 +0000 (23:00 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 6 Nov 2009 07:00:48 +0000 (23:00 -0800)

Trivial merge