]> git.hungrycats.org Git - linux/commitdiff
Merge hum.(none):/garz/repo/linus-2.5
authorJeff Garzik <jgarzik@hum.(none)>
Wed, 16 Apr 2003 09:07:39 +0000 (05:07 -0400)
committerJeff Garzik <jgarzik@hum.(none)>
Wed, 16 Apr 2003 09:07:39 +0000 (05:07 -0400)
into hum.(none):/garz/repo/net-drivers-2.5

1  2 
include/linux/pci_ids.h

Simple merge