]> git.hungrycats.org Git - linux/commitdiff
Merge bk://lia64.bkbits.net/to-linus-2.5/
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 15 Mar 2002 07:35:12 +0000 (23:35 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 15 Mar 2002 07:35:12 +0000 (23:35 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge