]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Aug 2023 09:11:40 +0000 (09:11 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Aug 2023 09:11:40 +0000 (09:11 +0000)
1  2 
config/rootfiles/common/udev
config/rootfiles/oldcore/177/filelists/files
config/rootfiles/oldcore/177/update.sh
lfs/udev

index 64d33ee6ca7642727c43bb5b8d2495068d5c6ae7,5cd9e077f4ddc26d1e8efaddc3224158ae915e37..e5c9bd01f88ac4414453dd3c0476682652c2db8e
@@@ -80,8 -72,6 +80,7 @@@ lib/udev/rules.d/75-net-description.rul
  lib/udev/rules.d/75-probe_mtd.rules
  lib/udev/rules.d/78-sound-card.rules
  lib/udev/rules.d/80-drivers.rules
- lib/udev/rules.d/90-hwrng.rules
 +lib/udev/rules.d/81-net-dhcp.rules
  lib/udev/rules.d/99-aqm.rules
  lib/udev/rules.d/99-offloading.rules
  lib/udev/scsi_id
diff --cc lfs/udev
Simple merge