diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 20:17:02 -0600 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 20:17:02 -0600 |
commit | 7b16318dea8d9840dac567a2ae8c50ecdea36aea (patch) | |
tree | 8866511a03ba28dcfd98263aa0a8c65ef876c31b /include/scsi/scsi_transport_spi.h | |
parent | Merge by hand (conflicts in scsi_lib.c) (diff) | |
download | linux-dev-7b16318dea8d9840dac567a2ae8c50ecdea36aea.tar.xz linux-dev-7b16318dea8d9840dac567a2ae8c50ecdea36aea.zip |
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'include/scsi/scsi_transport_spi.h')
0 files changed, 0 insertions, 0 deletions