Merge commit 'linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 15 Dec 2009 16:49:32 +0000 (08:49 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 15 Dec 2009 16:49:32 +0000 (08:49 -0800)

Trivial merge