diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:23:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:23:20 +0200 |
| commit | 0afe2db21394820d32646a695eccf3fbfe6ab5c7 (patch) | |
| tree | 6d925383f444a242ebc77d167420efb7e6ad8d99 /include/asm-x86/a.out.h | |
| parent | Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B (diff) | |
| parent | x86, debug: print more information about unknown CPUs (diff) | |
| download | linux-0afe2db21394820d32646a695eccf3fbfe6ab5c7.tar.xz linux-0afe2db21394820d32646a695eccf3fbfe6ab5c7.zip | |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/asm-x86/a.out.h')
0 files changed, 0 insertions, 0 deletions