author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1260895772 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1260895772 -0800

Merge commit 'linus' into next
¢&b