From ddade4d8dcc33054eec03edd229a73cffeb518fc Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Mon, 19 Jan 2009 13:50:32 +0200
Subject: [PATCH] --- yaml --- r: 134174 b: refs/heads/master c:
 eb80ed8d1fc0f3005ab356fbd8d61d870e3038e6 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mesh.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6f1b1a4528ed..a0f4c16d19ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cf2d186e4c52308cad8ecd893924e22ed020605
+refs/heads/master: eb80ed8d1fc0f3005ab356fbd8d61d870e3038e6
diff --git a/trunk/net/mac80211/mesh.h b/trunk/net/mac80211/mesh.h
index c5b0b5833468..f1196f5c3efe 100644
--- a/trunk/net/mac80211/mesh.h
+++ b/trunk/net/mac80211/mesh.h
@@ -24,15 +24,15 @@
  *
  *
  *
- * @MESH_PATH_ACTIVE: the mesh path is can be used for forwarding
- * @MESH_PATH_RESOLVED: the discovery process is running for this mesh path
+ * @MESH_PATH_ACTIVE: the mesh path can be used for forwarding
+ * @MESH_PATH_RESOLVING: the discovery process is running for this mesh path
  * @MESH_PATH_DSN_VALID: the mesh path contains a valid destination sequence
  * 	number
  * @MESH_PATH_FIXED: the mesh path has been manually set and should not be
  * 	modified
  * @MESH_PATH_RESOLVED: the mesh path can has been resolved
  *
- * MESH_PATH_RESOLVED and MESH_PATH_DELETE are used by the mesh path timer to
+ * MESH_PATH_RESOLVED is used by the mesh path timer to
  * decide when to stop or cancel the mesh path discovery.
  */
 enum mesh_path_flags {