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)
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


Trivial merge