Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 Dec 2008 09:10:06 +0000 (01:10 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 Dec 2008 09:10:06 +0000 (01:10 -0800)

Trivial merge