Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
Ingo Molnar [Mon, 14 Feb 2011 14:15:16 +0000 (15:15 +0100)]
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge