Merge branch 'for-5.16/u2fzero' into for-linus

author Jiri Kosina <[email protected]>

Fri, 5 Nov 2021 11:15:23 +0000 (12:15 +0100)

committer Jiri Kosina <[email protected]>

Fri, 5 Nov 2021 11:15:23 +0000 (12:15 +0100)
author Jiri Kosina <[email protected]>
Fri, 5 Nov 2021 11:15:23 +0000 (12:15 +0100)
committer Jiri Kosina <[email protected]>
Fri, 5 Nov 2021 11:15:23 +0000 (12:15 +0100)
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-u2fzero.c
Simple merge
author	Jiri Kosina <[email protected]>
	Fri, 5 Nov 2021 11:15:23 +0000 (12:15 +0100)
committer	Jiri Kosina <[email protected]>
	Fri, 5 Nov 2021 11:15:23 +0000 (12:15 +0100)
		1	2
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-u2fzero.c	patch \|	diff1 \|	diff2 \|	blob \| history