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

The following commit has been merged in the master branch: commit d81f78ec37ecad3a4cc0a71d0ea1f74994ec5cda Author: Sven Eckelmann sven@narfation.org Date: Mon Oct 29 17:15:08 2012 +0100

batman-adv: Start new development cycle

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ce5e5b9..2f85577 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 "2012.4.0" +#define BATADV_SOURCE_VERSION "2012.5.0" #endif

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