]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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

Simple merge