Fix up SCSI mismerge
authorJames Bottomley <jejb@titanic.(none)>
Fri, 16 Dec 2005 02:17:02 +0000 (20:17 -0600)
committerJames Bottomley <jejb@titanic.(none)>
Fri, 16 Dec 2005 02:17:02 +0000 (20:17 -0600)
commit7b16318dea8d9840dac567a2ae8c50ecdea36aea
tree8866511a03ba28dcfd98263aa0a8c65ef876c31b
parent2a1e1379bae53f647c463a677cc2ec71b591c348
Fix up SCSI mismerge

I forgot to do a git-update-cache on the merged files ...
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
drivers/scsi/sr.c
drivers/scsi/st.c
include/scsi/scsi_cmnd.h