Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 19 Mar 2011 06:38:50 +0000 (23:38 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 19 Mar 2011 06:38:50 +0000 (23:38 -0700)

Trivial merge