Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 25 Jul 2012 05:43:04 +0000 (22:43 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 25 Jul 2012 05:43:04 +0000 (22:43 -0700)

Trivial merge