Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull ACPI and power management updates from Rafael Wysocki:

 - Rework of the ACPI namespace scanning code from Rafael J.  Wysocki
   with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg,
   Toshi Kani, and Yinghai Lu.

 - ACPI power resources handling and ACPI device PM update from Rafael
   J Wysocki.

 - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with
   contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner.

 - Support for Intel Lynxpoint LPSS from Mika Westerberg.

 - cpuidle update from Len Brown including Intel Haswell support, C1
   state for intel_idle, removal of global pm_idle.

 - cpuidle fixes and cleanups from Daniel Lezcano.

 - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with
   contributions from Stratos Karafotis and Rickard Andersson.

 - Intel P-states driver for Sandy Bridge processors from Dirk
   Brandewie.

 - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn.

 - cpufreq fixes related to ordering issues between acpi-cpufreq and
   powernow-k8 from Borislav Petkov and Matthew Garrett.

 - cpufreq support for Calxeda Highbank processors from Mark Langsdorf
   and Rob Herring.

 - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update
   from Shawn Guo.

 - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat,
   and Inderpal Singh.

 - Support for "lightweight suspend" from Zhang Rui.

 - Removal of the deprecated power trace API from Paul Gortmaker.

 - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso,
   Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu,
   Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki
   Ishimatsu.

* tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits)
  PM idle: remove global declaration of pm_idle
  unicore32 idle: delete stray pm_idle comment
  openrisc idle: delete pm_idle
  mn10300 idle: delete pm_idle
  microblaze idle: delete pm_idle
  m32r idle: delete pm_idle, and other dead idle code
  ia64 idle: delete pm_idle
  cris idle: delete idle and pm_idle
  ARM64 idle: delete pm_idle
  ARM idle: delete pm_idle
  blackfin idle: delete pm_idle
  sparc idle: rename pm_idle to sparc_idle
  sh idle: rename global pm_idle to static sh_idle
  x86 idle: rename global pm_idle to static x86_idle
  APM idle: register apm_cpu_idle via cpuidle
  cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
  cpufreq / intel_pstate: Change to disallow module build
  tools/power turbostat: display SMI count by default
  intel_idle: export both C1 and C1E
  ACPI / hotplug: Fix concurrency issues and memory leaks
  ...

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/include/uapi/asm/msr-index.h
Simple merge

diff --cc arch/x86/kernel/apm_32.c
index 8d7012b7f4020ffe3fc7cb7da0ed15cdfd05e5e7,9f4bc6a1164dda3160169b251e47ee0247654a85..66b5faffe14a983e7c39d201c3c50a4ef1126e32
--- 1/arch/x86/kernel/apm_32.c
--- 2/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@@ -905,11 -925,11 +926,10 @@@ static int apm_cpu_idle(struct cpuidle_
        unsigned int jiffies_since_last_check = jiffies - last_jiffies;
        unsigned int bucket;
  
-       WARN_ONCE(1, "deprecated apm_cpu_idle will be deleted in 2012");
  recalc:
 +      task_cputime(current, NULL, &stime);
        if (jiffies_since_last_check > IDLE_CALC_LIMIT) {
                use_apm_idle = 0;
 -              last_jiffies = jiffies;
 -              last_stime = current->stime;
        } else if (jiffies_since_last_check > idle_period) {
                unsigned int idle_percentage;
  

diff --cc drivers/clk/Makefile
index 0ad642fbe7946a3e4c96ae8a6694d0d73b97b935,ee11460a970d767c6832e05664f240047d23cdfd..14fde73ea6ff9f662fe11999f6b0d01632c5f7e9
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -25,7 -20,9 +25,8 @@@ endi
  obj-$(CONFIG_MACH_LOONGSON1)  += clk-ls1x.o
  obj-$(CONFIG_ARCH_U8500)      += ux500/
  obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
 -obj-$(CONFIG_ARCH_SUNXI)      += clk-sunxi.o
  obj-$(CONFIG_ARCH_ZYNQ)               += clk-zynq.o
+ obj-$(CONFIG_X86)             += x86/
  
  # Chip specific
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o

diff --cc drivers/clk/clk-highbank.c
Simple merge

diff --cc drivers/platform/x86/eeepc-laptop.c
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge