From dae33ee0447014e8f4086d6bb12f0582fd186caf Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Wed, 28 Jan 2004 04:24:55 +0000
Subject: [PATCH] merge from HEAD (20040128)

there's a lot of confliction in portals/knals/qswnal/qswnal_cb.c, need
Eric Barton check it more.
---
 lustre/tests/.RC_CURRENT.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lustre/tests/.RC_CURRENT.tag b/lustre/tests/.RC_CURRENT.tag
index 427e007..738c3ee 100644
--- a/lustre/tests/.RC_CURRENT.tag
+++ b/lustre/tests/.RC_CURRENT.tag
@@ -1 +1 @@
-RC_1_1_0_28
+RC_1_1_0_36
-- 
1.8.3.1