Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Oct 2008 03:29:12 +0000 (23:29 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Oct 2008 03:29:12 +0000 (23:29 -0400)

Trivial merge