Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Mar 2012 00:02:01 +0000 (17:02 -0700)

Trivial merge