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)
commitf61ea1b0c825a20a1826bb43a226387091934586
treefdedf0a2368f707e3fd5205db05bfcbac79606ec
parentd347da0deffa1d8f88f0d270eab040e4707c9916
parent7b32b8e018d8f8cc94c808a5fa84a3f889441b91
Merge git://git./linux/kernel/git/jejb/scsi-misc-2.6
block/scsi_ioctl.c
drivers/scsi/scsi_scan.c
drivers/scsi/scsi_transport_fc.c