Merge branches 'acpi-video', 'acpi-battery', 'acpi-spcr' and 'acpi-misc'

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c3feffb1c1cfd2b46685907300a9f026fb67e6a..7326317b65fc1450a523e17283fa0df1a8257adc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -301,6 +301,7 @@ S:  Supported
 F:     drivers/acpi/
 F:     drivers/pnp/pnpacpi/
 F:     include/linux/acpi.h
+F:     include/linux/fwnode.h
 F:     include/acpi/
 F:     Documentation/acpi/
 F:     Documentation/ABI/testing/sysfs-bus-acpi
@@ -310,6 +311,14 @@ F: drivers/pci/*/*acpi*
 F:     drivers/pci/*/*/*acpi*
 F:     tools/power/acpi/
 
+ACPI APEI
+M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:     Len Brown <lenb@kernel.org>
+L:     linux-acpi@vger.kernel.org
+R:     Tony Luck <tony.luck@intel.com>
+R:     Borislav Petkov <bp@alien8.de>
+F:     drivers/acpi/apei/
+
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:     Robert Moore <robert.moore@intel.com>
 M:     Lv Zheng <lv.zheng@intel.com>