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

The following commit has been merged in the master branch: commit 15c33da6e8c960e61691ec302fd72f247e97055b Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Oct 14 18:01:01 2013 +0200

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 773301a..f94f287b 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2013.4.0" +#define BATADV_SOURCE_VERSION "2013.5.0" #endif

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