Skip to content
Commit d487bb6e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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
parents c228352d 8d411cbf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment