]> err.no Git - linux-2.6/commit
[SCSI] fix up mismerge in osst
authorJames Bottomley <jejb@mulgrave.(none)>
Sat, 29 Oct 2005 14:42:17 +0000 (09:42 -0500)
committerJames Bottomley <jejb@mulgrave.(none)>
Sat, 29 Oct 2005 14:42:17 +0000 (09:42 -0500)
commit80e23babfcf21a2dc726d3be00e06993f02f0274
treeb4b3d48156c72e6c4997cae00fa270715a754066
parent19a7b4aebf9ad435c69a7e39930338499af4d152
[SCSI] fix up mismerge in osst

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/osst.c