diff options
| author | Jiri Kosina | 2024-01-08 21:15:36 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2024-01-08 21:15:36 +0100 |
| commit | 0b43615af19742e1f4f71d332e72381430804804 (patch) | |
| tree | 2db029e0f7bb7aebc1202385927068844e48a9c6 /scripts/Makefile | |
| parent | 53eb9356388169df4d805ba1fe14d5c7369bcf69 (diff) | |
| parent | b0fb904d074e810c22c26883b8ed4489c17d1292 (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
Diffstat (limited to 'scripts/Makefile')
0 files changed, 0 insertions, 0 deletions