MAINTAINERS: update Ross Zwisler's email address

[linux-block.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 29ddeb1bf015c46f6316b6d4a436c94bdb9b3ae9..fddb8c509e40d089e31287acf2c9b94951d1237b 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -154,6 +154,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>