.mailmap: update akpm@osdl.org
authorAndrew Morton <akpm@linux-foundation.org>
Fri, 19 Dec 2014 00:17:23 +0000 (16:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2014 03:08:11 +0000 (19:08 -0800)
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
.mailmap

diff --cc .mailmap
Simple merge