Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Aug 2010 01:35:17 +0000 (18:35 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 3 Aug 2010 01:35:17 +0000 (18:35 -0700)

Trivial merge