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

The following commit has been merged in the master branch: commit c20186b90fd73cf9bb20da55796fee00e63de9a4 Author: Sven Eckelmann sven@narfation.org Date: Mon Nov 14 10:22:13 2011 +0100

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 964ad4d..86354e0 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 "2011.4.0" +#define SOURCE_VERSION "2012.0.0" #endif

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