]> git.neil.brown.name Git - history.git/commitdiff
Merge master.kernel.org:/home/bcrl/aio-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Mon, 26 Aug 2002 05:30:32 +0000 (22:30 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Mon, 26 Aug 2002 05:30:32 +0000 (22:30 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
include/linux/sched.h

Simple merge