summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2019-07-16 20:43:08 +0300
committerWill Deacon <will@kernel.org>2019-07-22 16:25:10 +0300
commit0aafd138b322d0b1bec3f14cdef4be3374d9fc39 (patch)
tree882450a4db0d69679f8341936e1cf204ed07c0aa /.mailmap
parent5a9060e9437be47f92f85a2b5c7cd73314d080e8 (diff)
downloadlinux-0aafd138b322d0b1bec3f14cdef4be3374d9fc39.tar.xz
MAINTAINERS: Update my email address to @kernel.org
I will soon lose access to my @arm.com email address, so let's update the MAINTAINERS file to point to my @kernel.org address, as well as .mailmap for good measure. Note that my @arm.com address will still work, but someone else will be reading whatever is sent there. Don't say you didn't know! Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 0fef932de3db..23cfed2e015c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -132,6 +132,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
+Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
Mark Brown <broonie@sirena.org.uk>
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>