diff options
| author | Jiri Kosina <[email protected]> | 2017-09-05 09:03:59 +0000 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2017-09-05 09:03:59 +0000 |
| commit | d487bb6ef121357bd4cd42fe2b08a6857ed26525 (patch) | |
| tree | b19b1b5ab287b74ab24a2f1b7247b0aa72203943 /net/unix/af_unix.c | |
| parent | HID: ortek: add one more buggy device (diff) | |
| parent | HID: wacom: Do not completely map WACOM_HID_WD_TOUCHRINGSTATUS usage (diff) | |
| download | kernel-d487bb6ef121357bd4cd42fe2b08a6857ed26525.tar.gz kernel-d487bb6ef121357bd4cd42fe2b08a6857ed26525.zip | |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions
