Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Aug 2010 18:17:52 +0000 (11:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Aug 2010 18:17:52 +0000 (11:17 -0700)
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: recognize Lincroft Atom Processor
  intel_idle: no longer EXPERIMENTAL
  intel_idle: disable module support
  intel_idle: add support for Westmere-EX
  intel_idle: delete power_policy modparam, and choose substate functions
  intel_idle: delete substates DEBUG modparam

1  2 
drivers/idle/intel_idle.c

Simple merge