Merge http://gkernel.bkbits.net/net-drivers-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 21 Feb 2002 04:34:59 +0000 (20:34 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 21 Feb 2002 04:34:59 +0000 (20:34 -0800)
commitebd627f5a848579cb0cef4d1e94b31eee0b137cf
tree5fcf38c35bf417dea2732bcec8444866c2e29fa0
parentac87508c153b08e7ab9c25970d7542e61e8da11b
parent4fd9fa2e5fc0d4824e00c3be38e5d618d4adcf25
Merge http://gkernel.bkbits.net/net-drivers-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
drivers/net/natsemi.c
drivers/net/tokenring/olympic.c