[commits] [linux-merge]; branch, merge/master, updated. v4.1-rc4-3366-g16a97f5

The following commit has been merged in the merge/master branch: commit d27b2ba40a5eff2c4a5496a82d3ef96c977ac491 Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue Aug 4 14:43:16 2015 +0200

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 41d27c7..dde0039 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 "2015.1" +#define BATADV_SOURCE_VERSION "2015.2" #endif

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