Merge branch 'for-5.12/uclogic' into for-linus

author Jiri Kosina <[email protected]>

Tue, 23 Feb 2021 10:43:27 +0000 (11:43 +0100)

committer Jiri Kosina <[email protected]>

Tue, 23 Feb 2021 10:43:27 +0000 (11:43 +0100)
author Jiri Kosina <[email protected]>
Tue, 23 Feb 2021 10:43:27 +0000 (11:43 +0100)
committer Jiri Kosina <[email protected]>
Tue, 23 Feb 2021 10:43:27 +0000 (11:43 +0100)
diff --cc drivers/hid/hid-quirks.c
Simple merge
diff --cc drivers/hid/hid-uclogic-params.c
Simple merge
author	Jiri Kosina <[email protected]>
	Tue, 23 Feb 2021 10:43:27 +0000 (11:43 +0100)
committer	Jiri Kosina <[email protected]>
	Tue, 23 Feb 2021 10:43:27 +0000 (11:43 +0100)
		1	2
drivers/hid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-uclogic-params.c	patch \|	diff1 \|	diff2 \|	blob \| history