Merge branch 'for-5.15/cmedia' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 1 Sep 2021 19:56:46 +0000 (21:56 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 1 Sep 2021 19:56:46 +0000 (21:56 +0200)
1  2 
drivers/hid/Kconfig
drivers/hid/hid-ids.h

Simple merge
Simple merge