summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorSimona Vetter <simona.vetter@ffwll.ch>2024-09-03 15:20:51 +0200
committerSimona Vetter <simona.vetter@ffwll.ch>2024-09-03 20:07:57 +0200
commite066e9aa4d9c869c92d1d03647472e4ce96c0919 (patch)
tree55425d912eea0820d340422795ecc11158eaac16 /.mailmap
parentdrm/xe: Fix merge fails related to display runtime PM (diff)
downloadlinux-e066e9aa4d9c869c92d1d03647472e4ce96c0919.tar.xz
linux-e066e9aa4d9c869c92d1d03647472e4ce96c0919.zip
MAINATINERS: update drm maintainer contacts
Also fix a few places in gpu docs that are still relevant, and add a bunch of .mailmap entries. Acked-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 8ee01d9d7046..340261f53672 100644
--- a/.mailmap
+++ b/.mailmap
@@ -608,6 +608,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
Sibi Sankar <quic_sibis@quicinc.com> <sibis@codeaurora.org>
Sid Manning <quic_sidneym@quicinc.com> <sidneym@codeaurora.org>
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
+Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@ffwll.ch>
+Simona Vetter <simona.vetter@ffwll.ch> <daniel.vetter@intel.com>
+Simona Vetter <simona.vetter@ffwll.ch> <daniel@ffwll.ch>
+Simona Vetter <simona.vetter@ffwll.ch> <daniel@biene.ffwll.ch>
Simon Horman <horms@kernel.org> <simon.horman@corigine.com>
Simon Horman <horms@kernel.org> <simon.horman@netronome.com>
Simon Kelley <simon@thekelleys.org.uk>