diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 07:01:06 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 07:01:06 -0400 |
| commit | 93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4 (patch) | |
| tree | a6adc2d83018b98e45c91dbbc9c80e95d8a671b1 /MAINTAINERS | |
| parent | 3e79a8a67d6f28b2b1d4344253ca612e77cca8e6 (diff) | |
| parent | b39b0981b0811943d724915a8a0150d6ac5110e0 (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-- | MAINTAINERS | 1 |
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 | |||
| 1311 | T: git git://git.xilinx.com/linux-xlnx.git | 1311 | T: git git://git.xilinx.com/linux-xlnx.git |
| 1312 | S: Supported | 1312 | S: Supported |
| 1313 | F: arch/arm/mach-zynq/ | 1313 | F: arch/arm/mach-zynq/ |
| 1314 | F: drivers/cpuidle/cpuidle-zynq.c | ||
| 1314 | 1315 | ||
| 1315 | ARM64 PORT (AARCH64 ARCHITECTURE) | 1316 | ARM64 PORT (AARCH64 ARCHITECTURE) |
| 1316 | M: Catalin Marinas <catalin.marinas@arm.com> | 1317 | M: Catalin Marinas <catalin.marinas@arm.com> |