Merge branch 'for-4.18/multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
commit25721aefe1d0b0d604d66fb5912fb383ce56c6ac
tree4da443dbf4be259191b8386d90933fa3f0b75a1d
parent72d0beb4d6d4b17f925fc6d1e9ebfb548f2e809c
parentabb36fe691b28f2a64926b61448d6b9610ed879a
Merge branch 'for-4.18/multitouch' into for-linus

- improvement of duplicate usage handling in hid-input from Benjamin Tissoires
- Win 8.1 precisioun touchpad spec implementation from Benjamin Tissoires
drivers/hid/hid-core.c
drivers/hid/hid-input.c
include/linux/hid.h