tree 2e55122b3e9f10c24819f9a9f4a4610cfc8b7ae4
parent 895a39a084e5478121a74752a291165c4502378f
author Nicolas Pitre <nico@cam.org> 1171441976 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171469391 -0800

[PATCH] add .mailmap for proper git-shortlog output

This list was built into the git-shortlog tool and has been removed in the
latest version.  It should be maintained separately so this is what this
patch does.

A couple more entries were added to the original list as well.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Junio C Hamano <junkio@cox.net>
Cc: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>