| commit | 37d9a8c5ea8fc063841c133fc53cc168ee620762 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 06 10:56:02 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 06 10:56:02 2011 -0800 |
| tree | f39b864a636d10bdbda2db2af6f01b69bc6a919c | |
| parent | 017892c341033b3e961e695bc0bf1a815efcf92e [diff] | |
| parent | 79250af2d5953b69380a6319b493862bf4ece972 [diff] |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix included-by file reference comments x86, cpu: Only CPU features determine NX capabilities x86, cpu: Call verify_cpu during 32bit CPU startup x86, cpu: Clear XD_DISABLED flag on Intel to regain NX x86, cpu: Rename verify_cpu_64.S to verify_cpu.S