]> git.hungrycats.org Git - linux/commit
Merge nuts.ninka.net:/home/davem/src/BK/tg3-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Sun, 31 Aug 2003 16:08:24 +0000 (09:08 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Sun, 31 Aug 2003 16:08:24 +0000 (09:08 -0700)
commit32a54d4bb7ed24cbe05d287be04a15f4d72a2afc
tree0eebfa68d7aab49a484460bc192763cdd75ab59c
parent94dffce61263e28270df7c87f97e1c815923ce4e
parentbfbed2b7acfcc4cd877371547e09fec727881c36
Merge nuts.ninka.net:/home/davem/src/BK/tg3-2.5
into nuts.ninka.net:/disk1/davem/BK/tg3-2.5
include/linux/pci_ids.h
net/core/ethtool.c