Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --cc drivers/char/keyboard.c
Simple merge

diff --cc drivers/input/keyboard/atkbd.c
Simple merge

diff --cc drivers/input/mouse/logips2pp.c
Simple merge

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge

diff --cc drivers/usb/input/hid-core.c
Simple merge