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)
commitd487bb6ef121357bd4cd42fe2b08a6857ed26525
treeb19b1b5ab287b74ab24a2f1b7247b0aa72203943
parentc228352dc67ea8fa5770c83e2d9c2fbafb3e700a
parent8d411cbf46e515ca2b7ceb3d2b3f43e22813edac
Merge branch 'for-4.13/upstream-fixes' into for-linus

- WACOM_HID_WD_TOUCHRINGSTATUS usage mapping fix in Wacom driver
  from Jason Gerecke
- new Logitech device ID quirk from Kyle Roarty