Fix the merge fix
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 30 Jul 2004 19:19:03 +0000 (19:19 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 30 Jul 2004 19:19:03 +0000 (19:19 +0000)
commit52eedf45eb64977e63502a2694b9b51197ede29f
tree76863afa8133d0986f0df7a9f336321acdb23129
parented54dc1279543caf10ba95fb0a1e9fa47ab6c4b4
Fix the merge fix
kernel/sched.c