]> git.hungrycats.org Git - linux/commit
Merge redhat.com:/spare/repo/netdev-2.6/s2io
authorJeff Garzik <jgarzik@redhat.com>
Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
commit3b55888b03a13453e316b3564d56235046fdd406
tree2f44e6e9e21f442315594acabbae508f191a7ac2
parent523f051914788a27c6642801965b3a9235788bb9
parent82255f9bc4c4c3ad8d272924124ae1870b3e4353
Merge redhat.com:/spare/repo/netdev-2.6/s2io
into redhat.com:/spare/repo/net-drivers-2.6
drivers/net/Kconfig
drivers/net/Makefile
include/linux/pci_ids.h