Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 May 2011 07:06:26 +0000 (00:06 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 May 2011 07:06:26 +0000 (00:06 -0700)

Trivial merge