Merge branch 'for-5.20/uclogic' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 2 Aug 2022 19:25:14 +0000 (21:25 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 2 Aug 2022 19:25:14 +0000 (21:25 +0200)
commita60885b6a97b5dc9340dd9310a57b5682c2daf2d
tree23a9206c7ea96483200fc9ddf883424615276b58
parentdb244339fa60b6cda6a2a32adb85be7e08de167e
parent0cb1fc0988e32bda84c2b7218e0c761af1430baf
Merge branch 'for-5.20/uclogic' into for-linus

- XP-PEN Deco L support (José Expósito)
drivers/hid/hid-ids.h
drivers/hid/hid-uclogic-params.c