Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

Documentation/kernel-parameters.txt

drivers/char/keyboard.c

drivers/input/evdev.c

drivers/input/joystick/iforce/iforce-packets.c

drivers/input/joystick/iforce/iforce-usb.c

drivers/input/keyboard/atkbd.c

drivers/input/keyboard/sunkbd.c

drivers/input/mouse/Makefile

drivers/input/mouse/alps.c

drivers/input/mouse/logips2pp.c

drivers/input/mouse/psmouse-base.c

drivers/input/mouse/psmouse.h

drivers/input/mouse/trackpoint.c

drivers/input/mouse/trackpoint.h

drivers/input/serio/i8042-io.h

drivers/input/serio/i8042-ip22io.h

drivers/input/serio/i8042-jazzio.h

drivers/input/serio/i8042-sparcio.h

drivers/input/serio/i8042-x86ia64io.h

drivers/input/serio/i8042.c