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

The following commit has been merged in the master branch: commit 97575407e9547416a23de03d141072e639f04623 Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Jan 19 17:08:29 2016 +0100

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Antonio Quartulli a@unstable.cc

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 878c359..db45336 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 "2016.0" +#define BATADV_SOURCE_VERSION "2016.1" #endif

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