From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 19 Dec 2014 00:17:23 +0000 (-0800)
Subject: .mailmap: update akpm@osdl.org
X-Git-Tag: firefly_0821_release~176^2~2630^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d19c8ffb50c8337e4f933031e685eea2ce440dc;p=firefly-linux-kernel-4.4.55.git

.mailmap: update akpm@osdl.org

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/.mailmap b/.mailmap
index 1ad68731fb47..fd6e27adb7d6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,7 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
 Al Viro <viro@ftp.linux.org.uk>
 Al Viro <viro@zenIV.linux.org.uk>
 Andreas Herrmann <aherrman@de.ibm.com>
-Andrew Morton <akpm@osdl.org>
+Andrew Morton <akpm@linux-foundation.org>
 Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andy Adamson <andros@citi.umich.edu>
 Archit Taneja <archit@ti.com>