Merge branch 'next' into for-linus

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

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

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

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

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

diff --cc drivers/tty/sysrq.c
Simple merge

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