Manual merge with Linus
authorDmitry Torokhov <dtor_core@ameritech.net>
Sat, 10 Sep 2005 01:14:47 +0000 (20:14 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Sat, 10 Sep 2005 01:14:47 +0000 (20:14 -0500)
commitd344c5e0856ad03278d8700b503762dbc8b86e12
treea6d893a643470a3c2580a58f3228a55fa1fd1d82
parent010988e888a0abbe7118635c1b33d049caae6b29
parent87fc767b832ef5a681a0ff9d203c3289bc3be2bf
Manual merge with Linus
Documentation/kernel-parameters.txt
drivers/char/keyboard.c
drivers/input/evdev.c
drivers/input/mouse/psmouse-base.c
drivers/usb/input/hid-core.c
include/linux/input.h