]> git.hungrycats.org Git - linux/commitdiff
Merge master.kernel.org:/home/acme/BK/x25-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Thu, 26 Sep 2002 12:08:17 +0000 (05:08 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Thu, 26 Sep 2002 12:08:17 +0000 (05:08 -0700)
into nuts.ninka.net:/home/davem/src/BK/net-2.5


Trivial merge