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

author Benjamin Tissoires <[email protected]>

Wed, 5 Oct 2022 09:34:48 +0000 (10:34 +0100)

committer Benjamin Tissoires <[email protected]>

Wed, 5 Oct 2022 09:34:48 +0000 (10:34 +0100)
author Benjamin Tissoires <[email protected]>
Wed, 5 Oct 2022 09:34:48 +0000 (10:34 +0100)
committer Benjamin Tissoires <[email protected]>
Wed, 5 Oct 2022 09:34:48 +0000 (10:34 +0100)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Benjamin Tissoires <[email protected]>
	Wed, 5 Oct 2022 09:34:48 +0000 (10:34 +0100)
committer	Benjamin Tissoires <[email protected]>
	Wed, 5 Oct 2022 09:34:48 +0000 (10:34 +0100)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history