Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Sep 2009 04:16:56 +0000 (21:16 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 14 Sep 2009 04:16:56 +0000 (21:16 -0700)
commitfc8e1ead9314cf0e0f1922e661428b93d3a50d88
treef3cb97c4769b74f6627a59769f1ed5c92a13c58a
parent2bcaa6a4238094c5695d5b1943078388d82d3004
parent9de48cc300fb10f7d9faa978670becf5e352462a
Merge branch 'next' into for-linus
drivers/input/keyboard/atkbd.c
drivers/input/serio/i8042-x86ia64io.h