Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / Documentation / networking / batman-adv.txt

diff --git a/drivers/staging/batman-adv/README b/Documentation/networking/batman-adv.txt
similarity index 98%
rename from drivers/staging/batman-adv/README
rename to Documentation/networking/batman-adv.txt
index 7c878bb07f3a0a4895f18e7e3b51674a9ce54987..77f0cdd5b0dd4fc2352d8b0b590d1afe2a29881b 100644 (file)
--- a/drivers/staging/batman-adv/README
+++ b/Documentation/networking/batman-adv.txt
@@ -1,4 +1,4 @@
-[state: 04-09-2010]
+[state: 21-11-2010]
 
 BATMAN-ADV
 ----------
@@ -67,7 +67,8 @@ All  mesh  wide  settings  can be found in batman's own interface
 folder:
 
 #  ls  /sys/class/net/bat0/mesh/
-#  aggregated_ogms  bonding  orig_interval  vis_mode
+#  aggregated_ogms  bonding  fragmentation  orig_interval
+#  vis_mode
 
 
 There is a special folder for debugging informations:
@@ -237,4 +238,3 @@ You can also contact the Authors:
 
 Marek  Lindner  <lindner_marek@yahoo.de>
 Simon  Wunderlich  <siwu@hrz.tu-chemnitz.de>
-