]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/net-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 23 Dec 2002 12:28:42 +0000 (04:28 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 23 Dec 2002 12:28:42 +0000 (04:28 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge