Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 27 Oct 2011 04:46:20 +0000 (21:46 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 27 Oct 2011 04:46:20 +0000 (21:46 -0700)

Trivial merge