Merge branch 'for-5.12/playstation-v2' into for-linus

author Jiri Kosina <jkosina@suse.cz>

Tue, 23 Feb 2021 10:43:01 +0000 (11:43 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Tue, 23 Feb 2021 10:43:01 +0000 (11:43 +0100)
author Jiri Kosina <jkosina@suse.cz>
Tue, 23 Feb 2021 10:43:01 +0000 (11:43 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Tue, 23 Feb 2021 10:43:01 +0000 (11:43 +0100)
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Tue, 23 Feb 2021 10:43:01 +0000 (11:43 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 23 Feb 2021 10:43:01 +0000 (11:43 +0100)
		1	2
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history