Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 18 Oct 2010 04:20:19 +0000 (21:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 18 Oct 2010 04:20:19 +0000 (21:20 -0700)

Trivial merge