The following commit has been merged in the linux branch: commit a1a9b2b0de53e60f5139488ff6c869c2e2c732d1 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Sat May 22 17:17:53 2010 +0200

batman-adv: Move ABI documentation to our staging directory

diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/drivers/staging/batman-adv/sysfs-class-net-batman-adv similarity index 100% rename from Documentation/ABI/testing/sysfs-class-net-batman-adv rename to drivers/staging/batman-adv/sysfs-class-net-batman-adv diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/drivers/staging/batman-adv/sysfs-class-net-mesh similarity index 86% rename from Documentation/ABI/testing/sysfs-class-net-mesh rename to drivers/staging/batman-adv/sysfs-class-net-mesh index 0d96c9d..c75a87b 100644 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/drivers/staging/batman-adv/sysfs-class-net-mesh @@ -22,6 +22,4 @@ Description: showing the topology of the entire mesh is not easily feasible without having a central instance to collect the local topologies from all nodes. This file allows - to activate the collecting (server) mode. Once - activated the topology can be retrieved by reading - the vis_data file. + to activate the collecting (server) mode.