Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Sep 2009 04:16:56 +0000 (21:16 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Sep 2009 04:16:56 +0000 (21:16 -0700)

Trivial merge