Merge branch 'for-4.15/wacom' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
commit01125b2d1fe9d691333cc90b17a4e2fd5bb908a2
tree7fab7e06d41302e621d7ad00493b15baf81b8ea4
parent4b545304947147bd4b9890160d328780c97bac33
parent5b01b3b8b122fde7fbe116803f7863667b4c5beb
Merge branch 'for-4.15/wacom' into for-linus

- High resolution mode for DEll canvas support, from Benjamin Tissoires
- A lot of improvements to pen handling in the Wacom driver, from Jason Gerecke

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_sys.c
drivers/hid/wacom_wac.h