Merge remote-tracking branch 'input/next'

diff --cc drivers/input/keyboard/adp5588-keys.c
Simple merge

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

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

diff --cc drivers/input/misc/twl6040-vibra.c
Simple merge

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/wacom_w8001.c
Simple merge

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