Merge branch 'linus' into x86/urgent
Ingo Molnar [Sun, 20 Sep 2009 18:24:58 +0000 (20:24 +0200)]
Merge reason: Bring in changes that the next patch will depend on.

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

1  2 
arch/x86/include/asm/apic.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/setup.c
arch/x86/kernel/tsc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge