summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 13:01:06 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 13:01:06 +0200
commit93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4 (patch)
treea6adc2d83018b98e45c91dbbc9c80e95d8a671b1 /MAINTAINERS
parent3e79a8a67d6f28b2b1d4344253ca612e77cca8e6 (diff)
parentb39b0981b0811943d724915a8a0150d6ac5110e0 (diff)
Merge branch 'pm-cpuidle'
* pm-cpuidle: cpuidle: Fix ARCH_NEEDS_CPU_IDLE_COUPLED dependency warning cpuidle: Comment the driver's framework code cpuidle: simplify multiple driver support ARM: zynq: Add cpuidle support cpuidle: improve governor Kconfig options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 95911afa818f..1ad3d8c3ed83 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1311,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>