merge by hand (scsi_device.h)
authorJames Bottomley <jejb@titanic>
Mon, 18 Apr 2005 18:45:00 +0000 (13:45 -0500)
committerJames Bottomley <jejb@titanic>
Mon, 18 Apr 2005 18:45:00 +0000 (13:45 -0500)
commitc46f2ffb9e7fce7208c2639790e1ade42e00b146
tree284912295d46a861930d0619788a650f56c2a29b
parentc2a9331c62216e222a08de8dd58559367fef0af6
parentf59114b7b5dc677bbd7cc7e26a5fcb3572a3445c
merge by hand (scsi_device.h)
drivers/s390/scsi/zfcp_aux.c
drivers/scsi/scsi_lib.c
drivers/scsi/sg.c
include/scsi/scsi_device.h