summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-12-20 09:51:10 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-12-20 09:51:10 +0100
commitfbdd256fe701a680f6eab3fa93dbab1942ab6a9f (patch)
treefcd18dc13a2a7007c3fcd5c0ff62de502737dfc0
parentae6252d8dfeb21f5067a09a8f4a6dd30851d70c1 (diff)
downloadlinux-fbdd256fe701a680f6eab3fa93dbab1942ab6a9f.tar.bz2
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>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 00581c1f0983..a6cddf3f85fe 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 cc0a4a8ae06a..0f0b79b51aa3 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