Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 19 Jul 2016 18:02:56 +0000 (11:02 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 19 Jul 2016 18:02:56 +0000 (11:02 -0700)
commit8c57a5e7b2820f349c95b8c8393fec1e0f4070d2
tree8ef0f3c986968392ccdc70ca43b23eba729e2019
parent0bb11e969f5367dcb661f9fcc77efd5d58a2c470
parent6a5029e66404462a3322dba8e35615bd09332081
Merge branch 'for-linus' into next

Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/input/input.c
drivers/input/mouse/elantech.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile