Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[sfrench/cifs-2.6.git] / .mailmap
2007-02-14 Linus TorvaldsMerge branch 'for-linus' of git://one.firstfloor.org...
2007-02-14 Nicolas Pitre[PATCH] add .mailmap for proper git-shortlog output