The following commit has been merged in the next branch: commit 5c8bc197fd129643f50dbe6fce6f0f1f045ddcba Merge: fe476985951d185caf16aa59e78088365c3b5dd0 65e81cd08eddc024cb43031c311a3efe4f10a6a7 Author: Sven Eckelmann sven@narfation.org Date: Fri Mar 30 18:43:54 2012 +0200

Merge tag 'v2012.1.0'

batman-adv 2012.1.0

Conflicts: README

diff --combined README.external index 95a7eb4,e844241..874ee7f --- a/README.external +++ b/README.external @@@ -6,7 -6,7 +6,7 @@@ and as external module. The external m new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work - with Linux 2.6.29 - 3.3. Supporting older versions is not + with Linux 2.6.29 - 3.4. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)

@@@ -36,8 -36,6 +36,8 @@@ module). Available options and thei (default marked with an "*")

* CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) + * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) + * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table)

e.g., debugging can be enabled by