Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 07:54:15 +0000 (21:54 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 07:54:15 +0000 (21:54 -1000)
* '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

1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/sh/kernel/idle.c

Simple merge
diff --cc MAINTAINERS
Simple merge
  #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;