Merge branches 'sched/devel', 'sched/cpu-hotplug', 'sched/cpusets' and 'sched/urgent...
Ingo Molnar [Wed, 8 Oct 2008 09:31:02 +0000 (11:31 +0200)]
1  2  3  4 
arch/ia64/kernel/smpboot.c
kernel/cpu.c

Simple merge
diff --cc kernel/cpu.c
Simple merge