diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 19:56:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 19:56:02 +0100 |
| commit | 37d9a8c5ea8fc063841c133fc53cc168ee620762 (patch) | |
| tree | f39b864a636d10bdbda2db2af6f01b69bc6a919c /net/ethernet | |
| parent | Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | x86: Fix included-by file reference comments (diff) | |
| download | linux-37d9a8c5ea8fc063841c133fc53cc168ee620762.tar.xz linux-37d9a8c5ea8fc063841c133fc53cc168ee620762.zip | |
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
Diffstat (limited to 'net/ethernet')
0 files changed, 0 insertions, 0 deletions