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)

Trivial merge