Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Aug 2010 15:41:58 +0000 (08:41 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Aug 2010 15:41:58 +0000 (08:41 -0700)

Trivial merge