Merge branch 'la/mailmap-entry'

gitster · gitster · commit 6c69d3a91f20 · 2024-04-19T09:13:47.000-07:00
Update contact address for Linus Arver.

* la/mailmap-entry:
  mailmap: change primary address for Linus Arver
diff --git a/.mailmap b/.mailmap
@@ -152,6 +152,7 @@ Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <lars.doelle@on-line.de>
 Lars Noschinski <lars@public.noschinski.de> <lars.noschinski@rwth-aachen.de>
 Li Hong <leehong@pku.edu.cn>
+Linus Arver <linus@ucla.edu> <linusa@google.com>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
 Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>

-Original file line number
+Diff line change
 Lars Doelle <[email protected]>
 Lars Noschinski <[email protected]> <[email protected]>
 Li Hong <[email protected]>
 +Linus Arver <[email protected]> <[email protected]>
 Linus Torvalds <[email protected]> <[email protected]>
 Linus Torvalds <[email protected]> <[email protected]>
 Linus Torvalds <[email protected]> <[email protected]>