Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
commit7d6322b4659216fff76619d3b4088eecbdfa46d5
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Oct 2005 15:07:10 +0000 (3 08:07 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Oct 2005 15:07:10 +0000 (3 08:07 -0700)
tree19aa385d903fcc0f2b5d6d978dc83a87c2eca95f
parentd6b9acc0c6c4a7c5d484d15271a5274656d0864f
parent51c928c34fa7cff38df584ad01de988805877dba
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6
include/linux/pci_ids.h