aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-cris
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-12-15 21:17:02 -0500
committerJames Bottomley <jejb@titanic.(none)>2005-12-15 21:17:02 -0500
commit7b16318dea8d9840dac567a2ae8c50ecdea36aea (patch)
tree8866511a03ba28dcfd98263aa0a8c65ef876c31b /include/asm-cris
parent2a1e1379bae53f647c463a677cc2ec71b591c348 (diff)
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'include/asm-cris')
0 files changed, 0 insertions, 0 deletions