]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d0b85e a511104)
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
authorJeff Garzik <jgarzik@mandrakesoft.com>
Fri, 14 Jun 2002 14:05:07 +0000 (10:05 -0400)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Fri, 14 Jun 2002 14:05:07 +0000 (10:05 -0400)
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

1  2 
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/pci_ids.h
Simple merge
Linux kernels and configurations used by Zygo.