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

batman at open-mesh.org batman at open-mesh.org
Thu Jan 16 00:19:59 CET 2014


The following commit has been merged in the master branch:
commit 8d90d775ca3ce58f987f335cde9a98407b0779a3
Author: Simon Wunderlich <sw at simonwunderlich.de>
Date:   Sat Jan 4 18:04:24 2014 +0100

    batman-adv: Start new development cycle
    
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 412c77f..9374f1a 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -24,7 +24,7 @@
 #define BATADV_DRIVER_DEVICE "batman-adv"
 
 #ifndef BATADV_SOURCE_VERSION
-#define BATADV_SOURCE_VERSION "2013.5.0"
+#define BATADV_SOURCE_VERSION "2014.1.0"
 #endif
 
 /* B.A.T.M.A.N. parameters */

-- 
LinuxNextTracking


More information about the linux-merge mailing list