]> err.no Git - linux-2.6/commitdiff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 16:04:01 +0000 (08:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 16:04:01 +0000 (08:04 -0800)
1  2 
include/linux/pci_ids.h

Simple merge