ACPI
 M:     "Rafael J. Wysocki" <rafael@kernel.org>
-M:     Len Brown <lenb@kernel.org>
+R:     Len Brown <lenb@kernel.org>
 L:     linux-acpi@vger.kernel.org
 S:     Supported
 W:     https://01.org/linux-acpi
 
 ACPI APEI
 M:     "Rafael J. Wysocki" <rafael@kernel.org>
-M:     Len Brown <lenb@kernel.org>
+R:     Len Brown <lenb@kernel.org>
 R:     James Morse <james.morse@arm.com>
 R:     Tony Luck <tony.luck@intel.com>
 R:     Borislav Petkov <bp@alien8.de>
 F:     include/acpi/
 F:     tools/power/acpi/
 
-ACPI FAN DRIVER
-M:     Zhang Rui <rui.zhang@intel.com>
-L:     linux-acpi@vger.kernel.org
-S:     Supported
-W:     https://01.org/linux-acpi
-B:     https://bugzilla.kernel.org
-F:     drivers/acpi/fan.c
-
 ACPI FOR ARM64 (ACPI/arm64)
 M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 M:     Hanjun Guo <guohanjun@huawei.com>
 B:     https://bugzilla.kernel.org
 F:     drivers/acpi/*thermal*
 
-ACPI VIDEO DRIVER
-M:     Zhang Rui <rui.zhang@intel.com>
-L:     linux-acpi@vger.kernel.org
-S:     Supported
-W:     https://01.org/linux-acpi
-B:     https://bugzilla.kernel.org
-F:     drivers/acpi/acpi_video.c
-
 ACPI VIOT DRIVER
 M:     Jean-Philippe Brucker <jean-philippe@linaro.org>
 L:     linux-acpi@vger.kernel.org