]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.ninka.net:/disk1/davem/BK/network-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Thu, 30 Oct 2003 02:49:41 +0000 (18:49 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Thu, 30 Oct 2003 02:49:41 +0000 (18:49 -0800)
into nuts.ninka.net:/disk1/davem/BK/net-2.5

1  2 
net/core/dev.c

diff --cc net/core/dev.c
Simple merge