Merge branches 'for-5.15/wacom', 'for-5.15/goodix', 'for-5.15/cmedia' and 'for-5...

author Jiri Kosina <jkosina@suse.cz>

Wed, 28 Jul 2021 10:03:47 +0000 (12:03 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Wed, 28 Jul 2021 10:03:47 +0000 (12:03 +0200)
author Jiri Kosina <jkosina@suse.cz>
Wed, 28 Jul 2021 10:03:47 +0000 (12:03 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Wed, 28 Jul 2021 10:03:47 +0000 (12:03 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-apple.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Wed, 28 Jul 2021 10:03:47 +0000 (12:03 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 28 Jul 2021 10:03:47 +0000 (12:03 +0200)
		1	2	3	4	5
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-apple.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history