---------------------
PatchSet 8094 
Date: 2006/05/30 20:26:42
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge error

Members: 
	src/fs/aufs/store_dir_aufs.c:1.35.8.4->1.35.8.5 

Index: squid/src/fs/aufs/store_dir_aufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/aufs/store_dir_aufs.c,v
retrieving revision 1.35.8.4
retrieving revision 1.35.8.5
diff -u -r1.35.8.4 -r1.35.8.5
--- squid/src/fs/aufs/store_dir_aufs.c	27 May 2006 19:11:09 -0000	1.35.8.4
+++ squid/src/fs/aufs/store_dir_aufs.c	30 May 2006 20:26:42 -0000	1.35.8.5
@@ -1892,9 +1892,9 @@
     sd->statfs = storeAufsDirStats;
     sd->maintainfs = storeAufsDirMaintain;
     sd->checkobj = storeAufsDirCheckObj;
+    sd->checkload = storeAufsDirCheckLoadAv;
     sd->refobj = storeAufsDirRefObj;
     sd->unrefobj = storeAufsDirUnrefObj;
-    sd->checkload = storeAufsDirCheckLoadAv;
     sd->callback = aioCheckCallbacks;
     sd->sync = aioSync;
     sd->obj.create = storeAufsCreate;