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-03 18:01:02 +0000
committerGitHub <noreply@github.com>2022-12-03 18:01:02 +0000
commite1399a2156bd8b612fb490b92a3a82efa2ad939c (patch)
tree7a76c61cd983ac01b6a6f92cd839b6d5830a1144 /maintainers
parent39739a47b07f1216fcd2dcf1d206285734aca760 (diff)
parentffa4eb958a435e9833bda0fdfc834e87232aa879 (diff)
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 19bc074f77eba..d675ff2dc9fbd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11985,6 +11985,12 @@
     githubId = 852967;
     name = "Russell O'Connor";
   };
+  rodrgz = {
+    email = "rodrgz@proton.me";
+    github = "rodrgz";
+    githubId = 53882428;
+    name = "Erik Rodriguez";
+  };
   roelvandijk = {
     email = "roel@lambdacube.nl";
     github = "roelvandijk";