Ingo Molnar 42390cdec5 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>

2008-09-04 13:02:35 +02:00

4.0 KiB

Raw Blame History

View Raw