Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Dmitry Torokhov [Tue, 19 Sep 2006 05:56:44 +0000 (01:56 -0400)]
1  2 
drivers/char/keyboard.c
drivers/input/keyboard/atkbd.c
drivers/input/mouse/logips2pp.c
drivers/input/mouse/psmouse-base.c
drivers/usb/input/hid-core.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge