summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-09-10 13:29:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-09-10 13:29:04 -0700
commit926de8c4326c14fcf35f1de142019043597a4fac (patch)
treee6a1d59f16438a9231b551b28d87f0abee8dfe93 /MAINTAINERS
parentd6498af58f5c7fb7b252f4791620fe4dd7213ca3 (diff)
parent8fbc1c5b91133f7ae5254061d2cb3326992635c4 (diff)
Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki: "These prevent a confusing PRMT-related message from being printed, drop an unnecessary header file include and update the list of ACPICA maintainers. Specifics: - Prevent a message about missing PRMT from being printed on systems that do not support PRM, which are the majority now (Aubrey Li). - Drop unnecessary header include from scan.c (Kari Argillander). - Update the list of ACPICA maintainers after recent departure of one of them (Rafael Wysocki)" * tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPICA: Update the list of maintainers ACPI: PRM: Find PRMT table before parsing it ACPI: scan: Remove unneeded header linux/nls.h
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 256a942440c4..0590fe14b3bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -364,7 +364,6 @@ F: drivers/acpi/apei/
ACPI COMPONENT ARCHITECTURE (ACPICA)
M: Robert Moore <robert.moore@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