]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6b9acc 51c928c)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Oct 2005 15:07:10 +0000 (08:07 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Oct 2005 15:07:10 +0000 (08:07 -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