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

The following commit has been merged in the master branch: commit fdc8ff101163f10d36187a890a3c4990cebb8b12 Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 5 15:23:55 2012 +0100

batman-adv: Start new development cycle

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 6b276e1..1468788 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.0.0" +#define SOURCE_VERSION "2012.1.0" #endif

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