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

The following commit has been merged in the master branch: commit 284fefd59ae0357695b17b59cb44d7cc12445bb5 Author: Sven Eckelmann sven@narfation.org Date: Sun Jun 17 13:26:37 2012 +0200

batman-adv: update internal version number

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index f4a3ec0..630bbe8 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -28,7 +28,7 @@ #define DRIVER_DEVICE "batman-adv"

#ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.2.0" +#define SOURCE_VERSION "2012.3.0" #endif

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