| commit | c7b01d3dc297969e66b430830254d447d21bafc9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 02 18:08:03 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 02 18:08:03 2011 -0800 |
| tree | 9a0900b0cd70ccca019fe189cc522e3ca309fa82 | |
| parent | ad4bfcb1cad7534ae98db3edc5415df97d3e109b [diff] | |
| parent | bfb53ccf1c734b1907df7189eef4c08489827951 [diff] |
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