| commit | d487bb6ef121357bd4cd42fe2b08a6857ed26525 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Sep 05 11:03:59 2017 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Sep 05 11:03:59 2017 +0200 |
| tree | b19b1b5ab287b74ab24a2f1b7247b0aa72203943 | |
| parent | c228352dc67ea8fa5770c83e2d9c2fbafb3e700a [diff] | |
| parent | 8d411cbf46e515ca2b7ceb3d2b3f43e22813edac [diff] |
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