Merge branch 'next' into for-linus

diff --cc drivers/input/keyboard/adp5588-keys.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