diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-20 11:18:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-20 11:18:43 -0700 |
| commit | 15d90b242290f228166ea79ee1cc2db6b31a2143 (patch) | |
| tree | 39744874c11202c9e0dd9777caddf7e55a1b6460 /lib/ucs2_string.c | |
| parent | 5f97cbe22b7616ead7ae267c29cad73bc1444811 (diff) | |
| parent | fcf887e7caaa813eea821d11bf2b7619a37df37a (diff) | |
| download | linux-15d90b242290f228166ea79ee1cc2db6b31a2143.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID fixes from Jiri Kosina:
- a few regression fixes for wacom driver (including fix for my earlier
mismerge) from Aaron Armstrong Skomra and Jason Gerecke
- revert of a few Logitech device ID additions which turn out to not
work perfectly with the hidpp driver at the moment; proper support is
now scheduled for 5.4. Fixes from Benjamin Tissoires
- scheduling-in-atomic fix for cp2112 driver, from Benjamin Tissoires
- new device ID to intel-ish, from Even Xu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: wacom: correct misreported EKR ring values
HID: cp2112: prevent sleeping function called from invalid context
HID: intel-ish-hid: ipc: add EHL device id
HID: wacom: Correct distance scale for 2nd-gen Intuos devices
HID: logitech-hidpp: remove support for the G700 over USB
Revert "HID: logitech-hidpp: add USB PID for a few more supported mice"
HID: wacom: add back changes dropped in merge commit
Diffstat (limited to 'lib/ucs2_string.c')
0 files changed, 0 insertions, 0 deletions