Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 31 Oct 2012 17:52:52 +0000 (13:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 31 Oct 2012 17:52:52 +0000 (13:52 -0400)
commit157083811c933fc223a3193d319c7ac805f30bb7
tree5ff8ebd0cd890b4949777199e44b05ff5d5cb807
parent1627801def0e1cef948f9d593e6757eab295803f
parent0aca86cd92282359d2f7202804bd92e7d092c04e
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

included changes:
- some code cleanups and minor fixes (3 of them were reported by Coverity)
- 'struct hard_iface' re-shaping to improve multi-protocol support
- ECTP packets silent drop
- transfer the WIFI flag on clients in case of roaming