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

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 11c231a d210baf)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 4 Sep 2008 11:02:35 +0000 (13:02 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 4 Sep 2008 11:02:35 +0000 (13:02 +0200)
commit	42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c
tree	e9684c84f53272319a5acd4b9c86503f30274a51	tree \| snapshot
parent	11c231a962c740b3216eb6565149ae5a7944cba7	commit \| diff
parent	d210baf53b699fc61aa891c177b71d7082d3b957	commit \| diff

Merge branch 'linus' into x86/x2apic

Conflicts:
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

16 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/cpucheck.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/addon_cpuid_features.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cyrix.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/genx2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/mpparse.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/paravirt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers