Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:28:25 +0000 (17:28 -0700)]
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge