]> git.hungrycats.org Git - linux/commitdiff
Merge master.kernel.org:/home/acme/BK/newdatalink-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Sun, 11 Aug 2002 10:39:05 +0000 (03:39 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Sun, 11 Aug 2002 10:39:05 +0000 (03:39 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5


Trivial merge