diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-22 19:16:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-22 19:16:05 +0100 |
commit | 787a3b4322763284a594a5dd3680508c0bfb20b0 (patch) | |
tree | bb02ff6637a2bb8a3c7c128cbd24f40bfd847ebc /drivers/hid/wacom_wac.c | |
parent | Merge tag 'xarray-5.0-rc3' of git://git.infradead.org/users/willy/linux-dax (diff) | |
parent | HID: core: simplify active collection tracking (diff) | |
download | linux-787a3b4322763284a594a5dd3680508c0bfb20b0.tar.xz linux-787a3b4322763284a594a5dd3680508c0bfb20b0.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID fixes from Jiri Kosina:
- descriptor parsing regression fix for devices that have more than 16
collections, from Peter Hutterer (and followup cleanup from Philipp
Zabel)
- quirk for Goodix touchpad
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: core: simplify active collection tracking
HID: i2c-hid: Disable runtime PM on Goodix touchpad
HID: core: replace the collection tree pointers with indices
Diffstat (limited to 'drivers/hid/wacom_wac.c')
0 files changed, 0 insertions, 0 deletions