summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2025-06-05 12:39:08 +1000
committerDave Airlie <airlied@redhat.com>2025-06-05 12:39:09 +1000
commit61a4b7d7d56cdbe5eefbf11ba3ed64bdd49f178b (patch)
tree75abe5a1e92965f4a928f3903738e7e8e0279835 /.mailmap
parent1c1df79ccf5615a007cb11ff30e997e58a9fa79a (diff)
parentee11d953fd230b4e1c28388913826ca832ae8444 (diff)
downloadlinux-61a4b7d7d56cdbe5eefbf11ba3ed64bdd49f178b.tar.gz
linux-61a4b7d7d56cdbe5eefbf11ba3ed64bdd49f178b.tar.bz2
linux-61a4b7d7d56cdbe5eefbf11ba3ed64bdd49f178b.zip
Merge tag 'drm-msm-fixes-2025-06-04' of https://gitlab.freedesktop.org/drm/msm into drm-next
Just some mailmap/MAINTAINER email address updates Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rob Clark <robdclark@gmail.com> Link: https://lore.kernel.org/r/CAF6AEGuW1kpUijxzLCc4TKph72-PfXvHTttNu214_1GB-R8qwg@mail.gmail.com
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 4 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 9afde79e1936..844b345f8102 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,7 +21,8 @@ Adam Radford <aradford@gmail.com>
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
Adrian Bunk <bunk@stusta.de>
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
-Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
+Akhil P Oommen <akhilpo@oss.qualcomm.com> <akhilpo@codeaurora.org>
+Akhil P Oommen <akhilpo@oss.qualcomm.com> <quic_akhilpo@quicinc.com>
Alan Cox <alan@lxorguk.ukuu.org.uk>
Alan Cox <root@hraefn.swansea.linux.org.uk>
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -625,6 +626,8 @@ Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com>
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
+Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@chromium.org>
+Rob Clark <robin.clark@oss.qualcomm.com> <robdclark@gmail.com>
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>