diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-05 12:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 12:01:40 +0000 |
| commit | ebb7cf0268f70d9bec950b71fb2c331a8993bf1b (patch) | |
| tree | e148ea2711d8b4433a6ebff1f668147fcbca5ca7 /maintainers | |
| parent | 2ae4a931aa1f3957ee26cd12cb529e817ca328e2 (diff) | |
| parent | a2c917865f4939150fef94f2323148e0d1e0e5bb (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8e642588d443..1f6d48f20d003 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9390,6 +9390,12 @@ githubId = 1222539; name = "Roman Naumann"; }; + naphta = { + email = "naphta@noreply.github.com"; + github = "naphta"; + githubId = 6709831; + name = "Jake Hill"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a43b3eb414121..a8e66897a683c 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -363,6 +363,17 @@ with lib.maintainers; { shortName = "Kodi"; }; + libretro = { + members = [ + aanderse + edwtjo + MP2E + thiagokokada + ]; + scope = "Maintain Libretro, RetroArch and related packages."; + shortName = "Libretro"; + }; + linux-kernel = { members = [ TredwellGit |