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

The following commit has been merged in the master branch: commit 6715fd3f0538e805b6a769d66823ec16b8b647ac Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Sat Apr 20 17:15:09 2013 +0200

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 6f25ef2..5e9aebb 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.2.0" +#define BATADV_SOURCE_VERSION "2013.3.0" #endif

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