Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[safe/jmp/linux-2.6] / .mailmap
2007-02-14 Nicolas Pitre[PATCH] add .mailmap for proper git-shortlog output