OpenAFS CVS Commit: openafs/src/afs/LINUX by shadow
   
    cvs@GRAND.CENTRAL.ORG
     
    cvs@GRAND.CENTRAL.ORG
       
    Tue, 19 Apr 2005 12:27:28 EDT
    
    
  
Update of /cvs/openafs/src/afs/LINUX
In directory GRAND.CENTRAL.ORG:/data/sb/openafs/src/afs/LINUX
Modified Files:
	osi_file.c osi_misc.c osi_prototypes.h 
Log Message:
DELTA linux-conflate-rdwrs-20050419
AUTHOR chas@cmf.nrl.navy.mil
FIXES 17561
conflate the 2 rdwr routines we have
--- DELTA config follows ---
linux-conflate-rdwrs-20050419 openafs/src/afs/LINUX/osi_file.c 1.24 1.25
linux-conflate-rdwrs-20050419 openafs/src/afs/LINUX/osi_misc.c 1.39 1.40
linux-conflate-rdwrs-20050419 openafs/src/afs/LINUX/osi_prototypes.h 1.11 1.12