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

The following commit has been merged in the master branch: commit dcba6c9b45a8c91ebb1b16a3595011404a19cf98 Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Dec 30 02:20:14 2014 +0100

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 18286f8..4d23188 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 "2014.4.0" +#define BATADV_SOURCE_VERSION "2015.0" #endif

/* B.A.T.M.A.N. parameters */