Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Mar 2010 07:55:20 +0000 (23:55 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Mar 2010 07:55:20 +0000 (23:55 -0800)

Trivial merge