Merge tag 'for-linus' of git://github.com/openrisc/linux

[sfrench/cifs-2.6.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index d96147eb1a68c7efa339dc33a66406ee93a9af3d..2a6f685bf70633757017a3bd1ff72c9d080cd7fd 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -31,6 +31,8 @@ Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
 Axel Dyks <xl@xlsigned.net>
 Axel Lin <axel.lin@gmail.com>
+Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
+Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>