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

The following commit has been merged in the master branch: commit b96a89818805d90513ac5516e17ecd9d8c19313a Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Feb 28 17:25:12 2017 +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 57a8103..f87b17c 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 "2017.0" +#define BATADV_SOURCE_VERSION "2017.1" #endif

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