Merge branch 'for-linus' into next

Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

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

diff --cc drivers/input/mouse/elantech.c
Simple merge

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

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