summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-12 17:31:45 +0300
committerArnd Bergmann <arnd@arndb.de>2018-03-12 17:31:45 +0300
commit32339eb0bf5184c7b3c0e2b430bf4a75c89b8402 (patch)
tree4fb17c429ace17ad080983a8eeb0f73fa877bf2d
parent3a5d470d076a5ebc6563601daa4867b2e84832e8 (diff)
parentc535d632aecc6359d072374675a7787cbe71773b (diff)
downloadlinux-32339eb0bf5184c7b3c0e2b430bf4a75c89b8402.tar.xz
Merge tag 'mvebu-fixes-4.16-2' of git://git.infradead.org/linux-mvebu into fixes
Pull "mvebu fixes for 4.16 (part 2)" from Gregory CLEMENT: - Updating my emails address but this time in mailmap (from free-electrons to bootlin) * tag 'mvebu-fixes-4.16-2' of git://git.infradead.org/linux-mvebu: mailmap: Update email address for Gregory CLEMENT
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e18cab73e209..a2ce89a456c2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,6 +62,7 @@ Frank Zago <fzago@systemfabricworks.com>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman <greg@kroah.com>
+Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
Henk Vergonet <Henk.Vergonet@gmail.com>
Henrik Kretzschmar <henne@nachtwindheim.de>
Henrik Rydberg <rydberg@bitmath.org>