]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b80345b 7ff622f)
Fix merge conflicts.
authorDavid S. Miller <davem@nuts.davemloft.net>
Tue, 18 May 2004 05:49:51 +0000 (22:49 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Tue, 18 May 2004 05:49:51 +0000 (22:49 -0700)
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.