]> git.hungrycats.org Git - linux/commitdiff
Merge http://gkernel.bkbits.net/net-drivers-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 18 Oct 2002 08:52:31 +0000 (01:52 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 18 Oct 2002 08:52:31 +0000 (01:52 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge