]> git.hungrycats.org Git - linux/commitdiff
Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5
authorDavid Mosberger <davidm@wailua.hpl.hp.com>
Wed, 13 Mar 2002 10:05:14 +0000 (02:05 -0800)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Wed, 13 Mar 2002 10:05:14 +0000 (02:05 -0800)
into wailua.hpl.hp.com:/bk/lia64/to-linus-2.5

1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge