Merge branch 'next' into for-linus

Prepare first round of input updates for 4.8 merge window.

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

diff --cc drivers/input/touchscreen/tsc200x-core.c
Simple merge

diff --cc drivers/tty/vt/keyboard.c
Simple merge