ACPICA: Update the list of maintainers

The Erik's last name and email address have changed recently,
so update MAINTAINERS and .mailmap to reflect that change.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/.mailmap b/.mailmap
index 00581c1f09838af86edba1ff7abd9bedd216a428..a6cddf3f85feccfb9549d647398c7b8b7dd6a846 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>

diff --git a/MAINTAINERS b/MAINTAINERS
index cc0a4a8ae06a5fda81ad42813b87e7e80bcf4f3f..0f0b79b51aa380b9499477cc33719ac88db97344 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -345,7 +345,7 @@ F:  drivers/acpi/apei/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:     Robert Moore <robert.moore@intel.com>
-M:     Erik Schmauss <erik.schmauss@intel.com>
+M:     Erik Kaneda <erik.kaneda@intel.com>
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 L:     linux-acpi@vger.kernel.org
 L:     devel@acpica.org