Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 Jun 2008 16:02:44 +0000 (12:02 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 17 Jun 2008 16:02:44 +0000 (12:02 -0400)
commit15439dd37f92f930ac7fc65a4f261834e4215bb0
treeec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7
parent39ab9ddeb3e9573a1ea9a17a1431ea5c81681964
parent90d95ef617a535a8832bdcb8dee07bf591e5dd82
Merge branch 'for-linus' into next

Conflicts:

drivers/input/mouse/appletouch.c
drivers/input/keyboard/atkbd.c
drivers/input/keyboard/pxa27x_keypad.c
drivers/input/mouse/appletouch.c
drivers/input/serio/i8042-x86ia64io.h
include/linux/input.h