[LV-k25-commit] CVS: kernel-2.5/drivers/scsi scsi_ioctl.c,1.6,1.7 scsi_merge.c,1.9,1.10

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv21851

Added Files:
	scsi_ioctl.c scsi_merge.c 
Log Message:
Oops - shouldn't have deleted scsi_ioctl.c and scsi_merge.c