tree 9a0900b0cd70ccca019fe189cc522e3ca309fa82
parent ad4bfcb1cad7534ae98db3edc5415df97d3e109b
parent bfb53ccf1c734b1907df7189eef4c08489827951
author Linus Torvalds <torvalds@linux-foundation.org> 1299118083 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299118083 -0800

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/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