Merge remote-tracking branch 'input/next'

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

diff --cc drivers/input/misc/Kconfig
Simple merge

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

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