Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[safe/jmp/linux-2.6] / .mailmap
2007-04-24 Michael BueschAdd mbuesch to .mailmap
2007-02-14 Nicolas Pitre[PATCH] add .mailmap for proper git-shortlog output