Merge branch 'x86/core' into core/ipi
Ingo Molnar [Fri, 13 Mar 2009 10:05:58 +0000 (11:05 +0100)]
1  2 
Makefile
arch/sparc/kernel/irq_64.c
include/linux/sched.h
include/linux/smp.h
kernel/sched.c
kernel/softirq.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge