Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  cpuidle: stop depending on pm_idle
  x86 idle: move mwait_idle_with_hints() to where it is used
  cpuidle: replace xen access to x86 pm_idle and default_idle
  cpuidle: create bootparam "cpuidle.off=1"
  mrst_pmu: driver for Intel Moorestown Power Management Unit

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/sh/kernel/idle.c
index 84db0d6,9c7099e..3c45de1
--- 1/arch/sh/kernel/idle.c
--- 2/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@@ -16,12 -16,13 +16,13 @@@
  #include <linux/thread_info.h>
  #include <linux/irqflags.h>
  #include <linux/smp.h>
+ #include <linux/cpuidle.h>
  #include <asm/pgalloc.h>
  #include <asm/system.h>
 -#include <asm/atomic.h>
 +#include <linux/atomic.h>
  #include <asm/smp.h>
  
- void (*pm_idle)(void) = NULL;
+ static void (*pm_idle)(void);
  
  static int hlt_counter;