Jonathan Ringer c2bb4bad68 Merge remote-tracking branch 'origin/master' into backport-staging-next ... Forgot to merge staging-next into master before branching off. This is meant to include the additional stabilization changes.		2021-05-22 18:48:23 -07:00
..
config	Merge pull request #101071 from ju1m/apparmor	2021-04-24 11:24:26 +00:00
hardware	maintainers: rename metadark -> kira-bruneau (#124035)	2021-05-22 16:47:40 +02:00
i18n/input-method	input methods: add kime	2021-04-19 03:05:07 +09:00
installer	nix: 2.3.10 -> 2.3.11	2021-05-14 12:24:54 +00:00
misc	21.05 beta release	2021-05-22 17:56:13 -07:00
profiles	Merge pull request #85073 from hyperfekt/systemd-pstore	2021-05-17 00:00:52 +02:00
programs	maintainers: rename metadark -> kira-bruneau (#124035)	2021-05-22 16:47:40 +02:00
security	nixos/security/apparmor: utillinux -> util-linux	2021-05-17 17:14:08 +02:00
services	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-22 18:19:10 -07:00
system	nixos/networkd: add missing [DHCPServer] options	2021-05-17 18:30:37 +02:00
tasks	nixos/tasks/filesystems: utillinux -> util-linux	2021-05-17 14:47:57 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	Merge pull request #122203 from mohe2015/imperative-nixos-container-timeout	2021-05-22 23:04:12 +02:00
module-list.nix	nixos/botamusique: init	2021-05-23 01:01:51 +02:00
rename.nix	quagga: remove	2021-04-22 12:48:48 +02:00