Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 02:08:03 +0000 (18:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 02:08:03 +0000 (18:08 -0800)
commitc7b01d3dc297969e66b430830254d447d21bafc9
tree9a0900b0cd70ccca019fe189cc522e3ca309fa82
parentad4bfcb1cad7534ae98db3edc5415df97d3e109b
parentbfb53ccf1c734b1907df7189eef4c08489827951
Merge branch 'idle-release' of git://git./linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: disable Atom/Lincroft HW C-state auto-demotion
  intel_idle: disable NHM/WSM HW C-state auto-demotion