X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=.mailmap;h=285e09645b31485d7bc314fb1fa7d055ec50fb46;hb=81c65213d73cc51f2f2e4326d602e107c07afb05;hp=2a6f685bf70633757017a3bd1ff72c9d080cd7fd;hpb=f3ea496213819c80ce9c49a9b65f9261da713d11;p=sfrench%2Fcifs-2.6.git

diff --git a/.mailmap b/.mailmap
index 2a6f685bf706..285e09645b31 100644
--- a/.mailmap
+++ b/.mailmap
@@ -159,6 +159,7 @@ Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
 Rémi Denis-Courmont <rdenis@simphalempin.com>
 Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
+Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
 Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>
 Sachin P Sant <ssant@in.ibm.com>