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
  ...

diff --combined MAINTAINERS
index 8bdd7a7ef2f4687aa26ee66a70fe8ad428e14890,2f20dc44bbb6d8fbf790df6e080829e3c07fae71..1bef08d407f3fa8ac22c3ce6da7a70f3ef0b1cd1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2206,6 -2206,15 +2206,15 @@@ S:    Maintaine
  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
@@@ -4941,12 -4950,6 +4950,12 @@@ W:    logfs.or
  S:    Maintained
  F:    fs/logfs/
  
 +LPC32XX MACHINE SUPPORT
 +M:    Roland Stigge <stigge@antcom.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-lpc32xx/
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
  M:    Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
@@@ -6631,7 -6634,7 +6640,7 @@@ S:      Supporte
  F:    fs/reiserfs/
  
  REGISTER MAP ABSTRACTION
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
  S:    Supported
  F:    drivers/base/regmap/
@@@ -6957,6 -6960,7 +6966,6 @@@ F:      drivers/scsi/st
  
  SCTP PROTOCOL
  M:    Vlad Yasevich <vyasevich@gmail.com>
 -M:    Sridhar Samudrala <sri@us.ibm.com>
  M:    Neil Horman <nhorman@tuxdriver.com>
  L:    linux-sctp@vger.kernel.org
  W:    http://lksctp.sourceforge.net
@@@ -7379,7 -7383,7 +7388,7 @@@ F:      sound
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lgirdwood@gmail.com>
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
@@@ -7468,7 -7472,7 +7477,7 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -8713,7 -8717,7 +8722,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@ti.com>
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git

diff --combined drivers/idle/intel_idle.c
index 1a38dd7dfe4e56c9b749cac1e741fe4ad092024c,6f80c132d4c9a2a94f8c13c1c8c5058a58d82399..0e8fab1913dfd8737ede3b7d9f332aee0861169e
--- 1/drivers/idle/intel_idle.c
--- 2/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@@ -71,7 -71,6 +71,6 @@@
  static struct cpuidle_driver intel_idle_driver = {
        .name = "intel_idle",
        .owner = THIS_MODULE,
-       .en_core_tk_irqen = 1,
  };
  /* intel_idle.max_cstate=0 disables driver */
  static int max_cstate = CPUIDLE_STATE_MAX - 1;
@@@ -339,7 -338,6 +338,6 @@@ static int intel_idle(struct cpuidle_de
        if (!(lapic_timer_reliable_states & (1 << (cstate))))
                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
  
-       stop_critical_timings();
        if (!need_resched()) {
  
                __monitor((void *)&current_thread_info()->flags, 0, 0);
@@@ -348,8 -346,6 +346,6 @@@
                        __mwait(eax, ecx);
        }
  
-       start_critical_timings();
- 
        if (!(lapic_timer_reliable_states & (1 << (cstate))))
                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
  
@@@ -465,7 -461,6 +461,7 @@@ static const struct x86_cpu_id intel_id
        ICPU(0x3c, idle_cpu_hsw),
        ICPU(0x3f, idle_cpu_hsw),
        ICPU(0x45, idle_cpu_hsw),
 +      ICPU(0x46, idle_cpu_hsw),
        {}
  };
  MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);