From: Peter Müller Date: Wed, 6 Jul 2022 06:14:54 +0000 (+0000) Subject: Merge branch 'next' into temp-c170-development X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f42dc99758f90700fc0fd1a12bb1768fb6a3f9e1;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'next' into temp-c170-development --- f42dc99758f90700fc0fd1a12bb1768fb6a3f9e1 diff --cc config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd index 0000000000,8acdb0f318..8acdb0f318 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd +++ b/config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd diff --cc config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd index 0000000000,4af11bfa1e..4af11bfa1e mode 000000,120000..120000 --- a/config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd +++ b/config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd diff --cc config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd index 0000000000,1b9fff70ff..1b9fff70ff mode 000000,120000..120000 --- a/config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd +++ b/config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd