]> git.hungrycats.org Git - linux/commit
Merge nuts.ninka.net:/disk1/davem/BK/tg3work-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Mon, 29 Dec 2003 17:05:05 +0000 (09:05 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 29 Dec 2003 17:05:05 +0000 (09:05 -0800)
commit27d56db8e1c44a0c3ae56bf81c93601b8f24e1b0
treeff295f94ec9ca753a4aa949f2af5a410c23e86c8
parente36a9e24d801036ebaa76d36cd271b80d84955b4
parent898e7d5a3eb61f00b39b7c316984cb1b5bc2b9b6
Merge nuts.ninka.net:/disk1/davem/BK/tg3work-2.5
into nuts.ninka.net:/disk1/davem/BK/tg3-2.6
include/linux/pci_ids.h