[commits] [linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da

The following commit has been merged in the batman-adv/next branch: commit 185d3da2f769684fd5e993c7a1e6a200c21e994a Author: Sven Eckelmann sven@narfation.org Date: Sun Aug 19 21:48:25 2012 +0200

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 61a0cfd..d57b746 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.3.0" +#define BATADV_SOURCE_VERSION "2012.4.0" #endif

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