Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 12 Jan 2011 06:01:45 +0000 (22:01 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 12 Jan 2011 06:01:45 +0000 (22:01 -0800)

Trivial merge