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

The following commit has been merged in the master branch: commit 7d0a55339f146a27282f95ab445d6d0324958a40 Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Aug 9 07:50:46 2016 +0200

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 06a8608..09af21e 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.3" +#define BATADV_SOURCE_VERSION "2016.4" #endif

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