Merge branch 'pm-cpuidle'

[linux-imx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5be702cc8449d3edb8107256bb03bac25d937238..1ad3d8c3ed83b07448405ef19ff6db8959a6fa16 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -242,6 +242,8 @@ F:  drivers/acpi/
 F:     drivers/pnp/pnpacpi/
 F:     include/linux/acpi.h
 F:     include/acpi/
+F:     Documentation/acpi
+F:     Documentation/ABI/testing/sysfs-bus-acpi
 
 ACPI FAN DRIVER
 M:     Zhang Rui <rui.zhang@intel.com>
@@ -1309,6 +1311,7 @@ W:        http://wiki.xilinx.com
 T:     git git://git.xilinx.com/linux-xlnx.git
 S:     Supported
 F:     arch/arm/mach-zynq/
+F:     drivers/cpuidle/cpuidle-zynq.c
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>