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)
commit4d7de66e2cc508761f050d1d4eaca88a6e6f711e
tree6b9943c1fc07de4420f95fa935e470760545780c
parente93adf1e6554511a6194f4785fd29af8e41104db
parenta4f1bac62564049ea4718c4624b0fadc9f597c84
Merge /pub/scm/linux/kernel/git/davem/net-2.6
include/linux/pci_ids.h