Merge branches 'acpi-apei', 'acpi-doc' and 'acpi-soc'

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 01a52fc964daeaf54e30cdfe86ba4e23a9e55425..9a6c83282bdf03f67b9db88a0c3da3fa8f51297d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -321,7 +321,7 @@ F:  drivers/pnp/pnpacpi/
 F:     include/linux/acpi.h
 F:     include/linux/fwnode.h
 F:     include/acpi/
-F:     Documentation/acpi/
+F:     Documentation/firmware-guide/acpi/
 F:     Documentation/ABI/testing/sysfs-bus-acpi
 F:     Documentation/ABI/testing/configfs-acpi
 F:     drivers/pci/*acpi*
@@ -4872,7 +4872,7 @@ S:        Maintained
 F:     Documentation/
 F:     scripts/kernel-doc
 X:     Documentation/ABI/
-X:     Documentation/acpi/
+X:     Documentation/firmware-guide/acpi/
 X:     Documentation/devicetree/
 X:     Documentation/i2c/
 X:     Documentation/media/
@@ -6042,7 +6042,7 @@ S:        Maintained
 F:     drivers/extcon/
 F:     include/linux/extcon/
 F:     include/linux/extcon.h
-F:     Documentation/extcon/
+F:     Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
 F:     Documentation/devicetree/bindings/extcon/
 
 EXYNOS DP DRIVER