Merge branch 'for-5.11/asus' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 16 Dec 2020 10:38:10 +0000 (11:38 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 Dec 2020 10:38:10 +0000 (11:38 +0100)
commit90c5f4649aafd0bca6f47f67ea0ba596c93a3ab0
tree3f0190964cc20b62218889cfff2256fae6a68751
parent36ed0958feaffc99214b17f668127bc2cfdcf5b4
parentb92b80246e06269c1407face33fd8a57a763a145
Merge branch 'for-5.11/asus' into for-linus

Support for ASUS N-Key keyboard, from Luke D Jones
drivers/hid/hid-ids.h