Merge branch 'for-5.15/sony' into for-linus

author Jiri Kosina <jkosina@suse.cz>

Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
author Jiri Kosina <jkosina@suse.cz>
Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-sony.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 1 Sep 2021 20:03:18 +0000 (22:03 +0200)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sony.c	patch \|	diff1 \|	diff2 \|	blob \| history