Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Apr 2009 15:51:52 +0000 (08:51 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Apr 2009 15:51:52 +0000 (08:51 -0700)

Trivial merge