Merge branch 'for-5.13/plantronics' into for-linus

author Jiri Kosina <[email protected]>

Thu, 29 Apr 2021 19:44:07 +0000 (21:44 +0200)

committer Jiri Kosina <[email protected]>

Thu, 29 Apr 2021 19:44:07 +0000 (21:44 +0200)
author Jiri Kosina <[email protected]>
Thu, 29 Apr 2021 19:44:07 +0000 (21:44 +0200)
committer Jiri Kosina <[email protected]>
Thu, 29 Apr 2021 19:44:07 +0000 (21:44 +0200)
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc include/linux/hid.h
Simple merge
author	Jiri Kosina <[email protected]>
	Thu, 29 Apr 2021 19:44:07 +0000 (21:44 +0200)
committer	Jiri Kosina <[email protected]>
	Thu, 29 Apr 2021 19:44:07 +0000 (21:44 +0200)
		1	2
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	patch \|	diff1 \|	diff2 \|	blob \| history