Merge branch 'acpica'

[linux.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index a7bc8cabd157b89adbc2d8f6c4d6e3c88b14e3cd..88e561b6c8174b976e6527bfd9ed5476e68d4c77 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -74,6 +74,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
 Domen Puncer <domen@coderock.org>
 Douglas Gilbert <dougg@torque.net>
 Ed L. Cashin <ecashin@coraid.com>
+Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
 Felipe W Damasio <felipewd@terra.com.br>
 Felix Kuhling <fxkuehl@gmx.de>