git.oblomov.eu Git - linux-2.6/commit

author	Ingo Molnar <mingo@elte.hu>
	Fri, 18 Jul 2008 21:00:05 +0000 (23:00 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 18 Jul 2008 21:00:05 +0000 (23:00 +0200)
commit	453c1404c5273a30d715e5a83372a78cff70b6d9
tree	94a5a3abd85137c4def416a84a45989751260f20	tree \| snapshot
parent	a208f37a465e222218974ab20a31b42b7b4893b2	commit \| diff
parent	35b680557f95564f70f21a8d3f5c72e101fab260	commit \| diff

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>

12 files changed:

Making Linux better for my computers

RSS Atom

arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmi_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mach-default/mach_apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mach-es7000/mach_apic.h	diff1 \|	diff2 \|	blob \| history