| commit | 08c18964a247b412acab56599a643e6f73e1ec5a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 17 14:21:43 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 17 14:21:43 2008 -0700 |
| tree | 467a028ec1d1b351577216d3c2bf1d2d46e8d0c5 | |
| parent | 20a249896bb53536b69b228593dbdb6eb0d18113 [diff] | |
| parent | e9623b35599fcdbc00c16535cbefbb4d5578f4ab [diff] |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: disable mwait for AMD family 10H/11H CPUs x86: fix crash on cpu hotplug on pat-incapable machines x86: remove mwait capability C-state check