Merge branch 'pm-cpuidle'

* pm-cpuidle: (51 commits)
  cpuidle: add maintainer entry
  ARM: s3c64xx: cpuidle: use init/exit common routine
  SH: cpuidle: use init/exit common routine
  cpuidle: fix comment format
  ARM: imx: cpuidle: use init/exit common routine
  ARM: davinci: cpuidle: use init/exit common routine
  ARM: kirkwood: cpuidle: use init/exit common routine
  ARM: calxeda: cpuidle: use init/exit common routine
  ARM: tegra: cpuidle: use init/exit common routine for tegra3
  ARM: tegra: cpuidle: use init/exit common routine for tegra2
  ARM: OMAP4: cpuidle: use init/exit common routine
  ARM: shmobile: cpuidle: use init/exit common routine
  ARM: tegra: cpuidle: use init/exit common routine
  ARM: OMAP3: cpuidle: use init/exit common routine
  ARM: at91: cpuidle: use init/exit common routine
  ARM: ux500: cpuidle: use init/exit common routine
  cpuidle: make a single register function for all
  ARM: ux500: cpuidle: replace for_each_online_cpu by for_each_possible_cpu
  cpuidle: remove en_core_tk_irqen flag
  ARM: OMAP3: remove cpuidle_wrap_enter
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8bdd7a7ef2f4..1bef08d407f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2206,6 +2206,15 @@ S:	Maintained
 F:      drivers/cpufreq/
 F:      include/linux/cpufreq.h
 
+CPUIDLE DRIVERS
+M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Daniel Lezcano <daniel.lezcano@linaro.org>
+L:      linux-pm@vger.kernel.org
+S:      Maintained
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+F:      drivers/cpuidle/*
+F:      include/linux/cpuidle.h
+
 CPUID/MSR DRIVER
 M:      "H. Peter Anvin" <hpa@zytor.com>
 S:      Maintained