| commit | 7b16318dea8d9840dac567a2ae8c50ecdea36aea | |
| author | James Bottomley <jejb@titanic.(none)> | |
| Fri, 16 Dec 2005 02:17:02 +0000 (15 20:17 -0600) | ||
| committer | James Bottomley <jejb@titanic.(none)> | |
| Fri, 16 Dec 2005 02:17:02 +0000 (15 20:17 -0600) | ||
| tree | 8866511a03ba28dcfd98263aa0a8c65ef876c31b | treesnapshot (tar.gz zip) |
| parent | 2a1e1379bae53f647c463a677cc2ec71b591c348 | commitdiff |
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
I forgot to do a git-update-cache on the merged files ...