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

The following commit has been merged in the master branch: commit 32bcad4b7f33f79847e6d4757e9cf26c6980bac6 Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Dec 15 18:13:23 2016 +0100

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index a6cc804..8683542 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.5" +#define BATADV_SOURCE_VERSION "2017.0" #endif

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