Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 27 Jul 2011 07:54:47 +0000 (00:54 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 27 Jul 2011 07:54:47 +0000 (00:54 -0700)

Trivial merge