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)
commit8cde0776ec1e86c270f65bf482f96288e6bf0023
tree6350a8d67bea7bcdcbd1705a54f1b8e409a28775
parent2ed5e6d09e266bd2288d49aaaf240ed8c468c13c
parentb78612b796b0d6cdfba553d456eff008278830e3
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6
include/linux/pci_ids.h