summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2022-01-31 15:48:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2022-02-01 11:21:31 -0800
commit1a2beb3d5a0b4051067ecf49ea799bee340e0e7c (patch)
treec69ac9d76a274716fb2a7bb97dfb65353a05b902 /.mailmap
parent630c12862c21a312c15a494922cdbf9c1beb1733 (diff)
downloadlinux-1a2beb3d5a0b4051067ecf49ea799bee340e0e7c.tar.bz2
mailmap: update Christian Brauner's email address
At least one of the addresses will stop functioning after February. Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b76e520809d0..8cd44b0c6579 100644
--- a/.mailmap
+++ b/.mailmap
@@ -80,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
+Christian Brauner <brauner@kernel.org> <christian@brauner.io>
+Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
+Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
Christophe Ricard <christophe.ricard@gmail.com>
Christoph Hellwig <hch@lst.de>
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>