summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2014-12-18 16:17:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-18 19:08:11 -0800
commit7d19c8ffb50c8337e4f933031e685eea2ce440dc (patch)
treeff7db56b4ad46569f817608a51fd0b77a75d0da3 /.mailmap
parent49abd8c28046adf77c5ce1949549aa64d7221881 (diff)
downloadblackbird-op-linux-7d19c8ffb50c8337e4f933031e685eea2ce440dc.tar.gz
blackbird-op-linux-7d19c8ffb50c8337e4f933031e685eea2ce440dc.zip
.mailmap: update akpm@osdl.org
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
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>
OpenPOWER on IntegriCloud