Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:30:12 +0000 (16:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:30:12 +0000 (16:30 -0800)
1  2 
block/scsi_ioctl.c
drivers/scsi/scsi_scan.c
drivers/scsi/scsi_transport_fc.c

Simple merge
Simple merge
Simple merge