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

author Jiri Kosina <[email protected]>

Thu, 29 Apr 2021 19:46:05 +0000 (21:46 +0200)

committer Jiri Kosina <[email protected]>

Thu, 29 Apr 2021 19:46:05 +0000 (21:46 +0200)
author Jiri Kosina <[email protected]>
Thu, 29 Apr 2021 19:46:05 +0000 (21:46 +0200)
committer Jiri Kosina <[email protected]>
Thu, 29 Apr 2021 19:46:05 +0000 (21:46 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-quirks.c
Simple merge
author	Jiri Kosina <[email protected]>
	Thu, 29 Apr 2021 19:46:05 +0000 (21:46 +0200)
committer	Jiri Kosina <[email protected]>
	Thu, 29 Apr 2021 19:46:05 +0000 (21:46 +0200)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history