Merge master into staging-next

This commit is contained in:
github-actions[bot]
2022-03-31 18:01:13 +00:00
committed by GitHub
293 changed files with 660 additions and 591 deletions

View File

@@ -241,7 +241,7 @@ in
"xhci_pci"
"usbhid"
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
"hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft"
"hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft" "hid_cherry"
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
# Misc. x86 keyboard stuff.