Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 May 2012 22:15:33 +0000 (18:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 May 2012 22:15:33 +0000 (18:15 -0400)
commit748336087374ca7e5369f310745fa1d3b4a8cbf7
treea13671709fa2cf67d7802526f2ebd4e282aa6010
parentc597f6653d5734c11b1e3217c7619a37e96e5a1f
parent521251f2f5fa16747cc21e71580e404af855d140
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:

* an improvement to avoid to linearise the whole received packet when not needed
* an improvement for client traffic rerouting after roaming
* a fix for the local translation table state-machine
* minor cleanups and fixes