about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-12-01 00:02:26 +0000
committerGitHub <noreply@github.com>2022-12-01 00:02:26 +0000
commit818d9a61a30374a643b33546b27e3cdac13f02dc (patch)
treee2326dbee51af00a32b244c70e777274b83ae91a /maintainers
parentcb51cfe7454106a06e00405ce7222691437a068b (diff)
parente989ef9671a711bdff9a096e4d5e6a495e631920 (diff)
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7750177545eb7..9075a976025e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1071,6 +1071,12 @@
     githubId = 56009;
     name = "Arcadio Rubio GarcĂ­a";
   };
+  archer-65 = {
+    email = "mario.liguori.056@gmail.com";
+    github = "archer-65";
+    githubId = 76066109;
+    name = "Mario Liguori";
+  };
   archseer = {
     email = "blaz@mxxn.io";
     github = "archseer";
@@ -9678,6 +9684,12 @@
     githubId = 43796009;
     name = "Max Wilson";
   };
+  myaats = {
+    email = "mats@mats.sh";
+    github = "Myaats";
+    githubId = 6295090;
+    name = "Mats";
+  };
   myrl = {
     email = "myrl.0xf@gmail.com";
     github = "Myrl";