Merge remote-tracking branch 'input/next'

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

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

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