aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2024-11-30 18:08:34 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2024-12-23 12:39:12 +0100
commit57769cb9ccbad92c5126264584346ebc8501b353 (patch)
tree6f53432431375f555dd53c0d05769174cade18ec
parentdt-bindings: net: can: atmel: Convert to json schema (diff)
downloadwireguard-linux-57769cb9ccbad92c5126264584346ebc8501b353.tar.xz
wireguard-linux-57769cb9ccbad92c5126264584346ebc8501b353.zip
mailmap: add an entry for Oliver Hartkopp
Map my retired company address and an accidentally used personal mail address within mailmap. Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Link: https://patch.msgid.link/20241130170911.2828-1-socketcan@hartkopp.net Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 5ff0e5d681e7..37ecf2632be3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -529,6 +529,8 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
Oleksij Rempel <o.rempel@pengutronix.de>
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
+Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
+Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
Ondřej Jirman <megi@xff.cz> <megous@megous.com>
Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>