The following commit has been merged in the master branch: commit 792ecdf05290ec8cfd1f7c5e69bd891be0995a34 Merge: 86b9780b49f721e248ce8a9a8da99e317ef08baf b82d11e243ec144c515e7d04e8e8c31b111a060d Author: Sven Eckelmann sven@narfation.org Date: Tue Jun 12 18:31:46 2012 +0200

Merge tag 'v2012.2.0'

batman-adv 2012.2.0

diff --combined README.external index 8739bca,0a38d90..e032ef1 --- 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.4. Supporting older versions is not + with Linux 2.6.29 - 3.5. 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. :-)

@@@ -21,7 -21,7 +21,7 @@@ if you want to compile against some oth

# make KERNELPATH=/path/to/kernel

-if you wont to install this module: +if you want to install this module:

# sudo make install

@@@ -29,7 -29,7 +29,7 @@@ CONFIGURATIO -------------

The in-kernel module can be configured through -menuconfig. When compiling outside of the kernel, tree it is +menuconfig. When compiling outside of the kernel tree, it is necessary to configure it using the make options. Each option can be set to to y (enabled), n (disabled) or m (build as module). Available options and their possible values are