From 80248f2b9acaef0f2392a9fe198cd622a5554505 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 25 Feb 2008 21:36:27 +0100
Subject: [PATCH] --- yaml --- r: 90079 b: refs/heads/master c:
 42096b634f87bb65e08d1fa61462d5b30d9779ca h: refs/heads/master i:   90077:
 dc5c5d6c4036e3e65bad404c97ad43f86940a198   90075:
 06a9a9b371b667ce37ce3e655a955426e06b47b8   90071:
 d83d11c051347e8be2d53f3953335b822956e56e   90063:
 42cbe147ec8e34ff43f8ccca54af66f07fd29861   90047:
 946850e6c3a22ac2c7b2a22e36fb39c255028901 v: v3

---
 [refs]                          | 2 +-
 trunk/net/mac80211/mesh_plink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e74f3e23da5..c20c00f04cab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6d1a5a7096172a1592115331a420630adf47f8c
+refs/heads/master: 42096b634f87bb65e08d1fa61462d5b30d9779ca
diff --git a/trunk/net/mac80211/mesh_plink.c b/trunk/net/mac80211/mesh_plink.c
index c2f4fe7a30b6..b5fbe970e48f 100644
--- a/trunk/net/mac80211/mesh_plink.c
+++ b/trunk/net/mac80211/mesh_plink.c
@@ -131,7 +131,7 @@ struct sta_info *mesh_plink_add(u8 *hw_addr, u64 rates, struct net_device *dev)
 }
 
 /**
- * __mesh_plink_deactivate - deactivate mesh peer link
+ * mesh_plink_deactivate - deactivate mesh peer link
  *
  * @sta: mesh peer link to deactivate
  *