From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 20 Dec 2019 08:51:10 +0000 (+0100)
Subject: ACPICA: Update the list of maintainers
X-Git-Tag: v5.6-rc1~191^2~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbdd256fe701a680f6eab3fa93dbab1942ab6a9f;p=thirdparty%2Flinux.git

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 00581c1f09838..a6cddf3f85fec 100644
--- 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 cc0a4a8ae06a5..0f0b79b51aa38 100644
--- 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