Merge branch 'for-4.13/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:03:59 +0000 (11:03 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:03:59 +0000 (11:03 +0200)
- WACOM_HID_WD_TOUCHRINGSTATUS usage mapping fix in Wacom driver
  from Jason Gerecke
- new Logitech device ID quirk from Kyle Roarty


Trivial merge