diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-19 01:00:05 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-19 01:00:05 +0400 |
| commit | 453c1404c5273a30d715e5a83372a78cff70b6d9 (patch) | |
| tree | 94a5a3abd85137c4def416a84a45989751260f20 /arch/x86/kernel/genx2apic_uv_x.c | |
| parent | a208f37a465e222218974ab20a31b42b7b4893b2 (diff) | |
| parent | 35b680557f95564f70f21a8d3f5c72e101fab260 (diff) | |
| download | linux-453c1404c5273a30d715e5a83372a78cff70b6d9.tar.xz | |
Merge branch 'x86/apic' into x86/x2apic
Conflicts:
arch/x86/kernel/paravirt.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c
arch/x86/lguest/boot.c
arch/x86/xen/enlighten.c
include/asm-x86/apic.h
include/asm-x86/paravirt.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/genx2apic_uv_x.c')
0 files changed, 0 insertions, 0 deletions