summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-08-29 17:29:08 +0200
committerArnd Bergmann <arnd@arndb.de>2019-08-29 17:29:09 +0200
commit48402892f2ea31376d50d972213b41f2e12f5e6f (patch)
tree1daed9bdacc71e619a477f6626aca295fa7f7245 /.mailmap
parent34614c30bf16d84392f8cc0173461b99e95a7b75 (diff)
parente32db73c5aca895a43061cf6621076aa798530e3 (diff)
downloadlinux-48402892f2ea31376d50d972213b41f2e12f5e6f.tar.bz2
Merge tag 'sunxi-fixes-for-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
A single patch to change my MAINTAINERS address * tag 'sunxi-fixes-for-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: MAINTAINERS: Update my email address Link: https://lore.kernel.org/r/8c04a96b-4a75-4e1f-b3ac-05fe091f251e.lettre@localhost Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index acba1a6163f1..ebdca3fba91f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -160,6 +160,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
+Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
+Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com>