Merge branch 'for-4.13/upstream-fixes' into for-linus

Browse source

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

...

This commit is contained in:

Jiri Kosina 2017-09-05 11:03:59 +02:00

parent c228352dc6 8d411cbf46

commit d487bb6ef1

3 changed files with 10 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/hid/hid-ids.h

View file

1

drivers/hid/usbhid/hid-quirks.c

View file

8

drivers/hid/wacom_wac.c

View file