Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 8 Apr 2009 07:00:33 +0000 (00:00 -0700)

Trivial merge