]> git.neil.brown.name Git - history.git/commitdiff
Merge master.kernel.org:/home/davem/BK/net-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 10 May 2002 05:46:48 +0000 (22:46 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 10 May 2002 05:46:48 +0000 (22:46 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge