]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb3bfebed571b18520f524f24853e27ae37c2fbdc
treeec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7
parenteb7d750c35b010ccae30125c2e226f302a6eb6bc
parent1d6fad343222d37fac325de6be044f2c7e3caef8
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