summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2020-01-15 15:47:31 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2020-01-15 15:47:31 +1100
commit9ad27362eb6eca1704fbf3b8c5870fbfe4b6c53c (patch)
tree65b9a97b04ba6f2cb7debbf4e0ac2aa1894a0582 /.mailmap
parentbce4215f5d562d1be7ebcd523075ad516675a93a (diff)
parentd53f9b68b359cb53076e32030e0cfc2a6fcfcbaf (diff)
Merge remote-tracking branch 'rtc/rtc-next'
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index bf581623ee3a..107839b348e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
+Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>