Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6.git] / .mailmap
2007-04-24 Michael Buesch Add mbuesch to .mailmap
2007-02-14 Nicolas Pitre [PATCH] add .mailmap for proper git-shortlog output