Merge branch 'for-linus' into next

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

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

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

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

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