]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e93adf1 a4f1bac)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 23:43:39 +0000 (16:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 23:43:39 +0000 (16:43 -0700)
1  2 
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/pci_ids.h
Simple merge
Linux 2.6 source tree