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

Some manual fixups required due to clashes with the PF_FREEZE cleanups.

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/input/evdev.c
Simple merge

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

diff --cc drivers/input/joydev.c
Simple merge

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

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

diff --cc drivers/input/mouse/psmouse.h
Simple merge

diff --cc drivers/input/mousedev.c
Simple merge

diff --cc drivers/usb/input/aiptek.c
Simple merge

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

diff --cc include/linux/input.h
Simple merge

diff --cc sound/oss/Kconfig
Simple merge

diff --cc sound/oss/es1370.c
Simple merge

diff --cc sound/oss/es1371.c
Simple merge

diff --cc sound/oss/esssolo1.c
Simple merge

diff --cc sound/pci/cs4281.c
Simple merge