]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://kernel.bkbits.net/davem/net-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 10 Jan 2003 00:57:12 +0000 (16:57 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 10 Jan 2003 00:57:12 +0000 (16:57 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge