Merge branch 'for-5.12/chicony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 23 Feb 2021 10:31:58 +0000 (11:31 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 23 Feb 2021 10:31:58 +0000 (11:31 +0100)
commitfcd89e77db4969a04736eef0e15ee31cc82d6ca1
treea0769d8200c607e3707dd45278251f8c54a49671
parent760f7e7b959580ee06d925ad737147a36b194e83
parent859b510bb7fa5797cfaf7bf5729336bf0e94dd2e
Merge branch 'for-5.12/chicony' into for-linus

- KEY_RFKILL support for Chicony devices from Jian-Hong Pan
drivers/hid/hid-ids.h