git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 53eb935 b0fb904)
Merge branch 'for-6.8/wacom' into for-linus
authorJiri Kosina <jkosina@suse.com>
Mon, 8 Jan 2024 20:15:36 +0000 (21:15 +0100)
committerJiri Kosina <jkosina@suse.com>
Mon, 8 Jan 2024 20:15:36 +0000 (21:15 +0100)
commit0b43615af19742e1f4f71d332e72381430804804
tree2db029e0f7bb7aebc1202385927068844e48a9c6tree
parent53eb9356388169df4d805ba1fe14d5c7369bcf69commit | diff
parentb0fb904d074e810c22c26883b8ed4489c17d1292commit | diff
Merge branch 'for-6.8/wacom' into for-linus

- functional fix for handling Confidence in Wacom driver (Jason Gerecke)
- power management fix for Wacom userspace battery exporting (Tatsunosuke Tobita)

Conflicts:
tools/testing/selftests/hid/tests/test_wacom_generic.py
tools/testing/selftests/hid/tests/test_wacom_generic.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.