Merge branch 'x86/core' into core/ipi

diff --cc Makefile
Simple merge

diff --cc arch/sparc/kernel/irq_64.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/smp.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/softirq.c
Simple merge