diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-22 20:32:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-22 20:32:02 -0400 |
| commit | 18261b8552232e342709e69eadec33090a7f04e4 (patch) | |
| tree | ecd17a26e30f20db41fb4b67c0f9060398a145bf /doc | |
| parent | ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (diff) | |
| parent | 194923246c199bc6a4baa2ffcda1e08677b6f07c (diff) | |
| download | u-boot-18261b8552232e342709e69eadec33090a7f04e4.zip u-boot-18261b8552232e342709e69eadec33090a7f04e4.tar.gz u-boot-18261b8552232e342709e69eadec33090a7f04e4.tar.bz2 | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxiWIP/22Oct2020
- sun8i emac changes (Andre)
- SCP firmware (Samuel)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-mailrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git-mailrc b/doc/git-mailrc index 31595a7..bbca3a9 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -36,7 +36,7 @@ alias marex Marek Vasut <marex@denx.de> alias mariosix Mario Six <mario.six@gdsys.cc> alias masahiro Masahiro Yamada <yamada.masahiro@socionext.com> alias mateusz Mateusz Kulikowski <mateusz.kulikowski@gmail.com> -alias maxime Maxime Ripard <maxime.ripard@free-electrons.com> +alias maxime Maxime Ripard <mripard@kernel.org> alias mbrugger Matthias Brugger <mbrugger@suse.com> alias monstr Michal Simek <monstr@monstr.eu> alias prom Minkyu Kang <mk7.kang@samsung.com> |