[linux-next] LinuxNextTracking branch, master, updated. next-20121126

batman at open-mesh.org batman at open-mesh.org
Tue Nov 27 00:21:22 CET 2012

The following commit has been merged in the master branch:
commit d81f78ec37ecad3a4cc0a71d0ea1f74994ec5cda
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 29 17:15:08 2012 +0100

    batman-adv: Start new development cycle
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index ce5e5b9..2f85577 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -26,7 +26,7 @@
 #define BATADV_DRIVER_DEVICE "batman-adv"
-#define BATADV_SOURCE_VERSION "2012.4.0"
+#define BATADV_SOURCE_VERSION "2012.5.0"
 /* B.A.T.M.A.N. parameters */


More information about the linux-merge mailing list