Merge master into staging-next

2021-05-14 00:58:11 +00:00
parent 39e3f7c2cc 7cd876f22d
commit bf5d8bb531
89 changed files with 2361 additions and 2905 deletions
@@ -37,6 +37,9 @@ in
      # drives.
      "uas"

+      # SD cards.
+      "sdhci_pci"
+
      # Firewire support.  Not tested.
      "ohci1394" "sbp2"