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

The following commit has been merged in the master branch: commit 7bed2ab8c62aed4e9ba55373d2a81faf481c3041 Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Jun 9 15:46:49 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 76925266..c356d91 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.2" +#define BATADV_SOURCE_VERSION "2016.3" #endif

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